diff options
Diffstat (limited to 'view/theme/dispy-dark')
| -rw-r--r-- | view/theme/dispy-dark/head.tpl | 24 | ||||
| -rw-r--r-- | view/theme/dispy-dark/jot-header.tpl | 3 | ||||
| -rw-r--r-- | view/theme/dispy-dark/jot.tpl | 2 | ||||
| -rw-r--r-- | view/theme/dispy-dark/nets.tpl | 2 | ||||
| -rw-r--r-- | view/theme/dispy-dark/saved_searches_aside.tpl | 6 | ||||
| -rw-r--r-- | view/theme/dispy-dark/search_item.tpl | 43 | ||||
| -rw-r--r-- | view/theme/dispy-dark/style.css | 43 | ||||
| -rw-r--r-- | view/theme/dispy-dark/wall_item.tpl | 15 | ||||
| -rw-r--r-- | view/theme/dispy-dark/wallwall_item.tpl | 52 |
9 files changed, 117 insertions, 73 deletions
diff --git a/view/theme/dispy-dark/head.tpl b/view/theme/dispy-dark/head.tpl index f606f2f7e..cd6f5ca97 100644 --- a/view/theme/dispy-dark/head.tpl +++ b/view/theme/dispy-dark/head.tpl @@ -7,7 +7,7 @@ <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" /> -<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" /> +<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" /> <link rel="search" href="$baseurl/opensearch" type="application/opensearchdescription+xml" @@ -34,14 +34,16 @@ function commentOpen(obj,id) { if(obj.value == '$comment') { obj.value = ''; - obj.className = "comment-edit-text-full"; + $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); + $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); openMenu("comment-edit-submit-wrapper-" + id); } } function commentClose(obj,id) { if(obj.value == '') { obj.value = '$comment'; - obj.className="comment-edit-text-empty"; + $("#comment-edit-text-" + id).removeClass("comment-edit-text-full"); + $("#comment-edit-text-" + id).addClass("comment-edit-text-empty"); closeMenu("comment-edit-submit-wrapper-" + id); } } @@ -63,6 +65,22 @@ $("#comment-edit-text-" + id).val(tmpStr + ins); } + function qCommentInsert(obj,id) { + var tmpStr = $("#comment-edit-text-" + id).val(); + if(tmpStr == '$comment') { + tmpStr = ''; + $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); + $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); + openMenu("comment-edit-submit-wrapper-" + id); + } + var ins = $(obj).val(); + ins = ins.replace('<','<'); + ins = ins.replace('>','>'); + ins = ins.replace('&','&'); + ins = ins.replace('"','"'); + $("#comment-edit-text-" + id).val(tmpStr + ins); + } + function showHideComments(id) { if( $('#collapsed-comments-' + id).is(':visible')) { $('#collapsed-comments-' + id).hide(); diff --git a/view/theme/dispy-dark/jot-header.tpl b/view/theme/dispy-dark/jot-header.tpl index 92eccf740..5838729cc 100644 --- a/view/theme/dispy-dark/jot-header.tpl +++ b/view/theme/dispy-dark/jot-header.tpl @@ -9,6 +9,7 @@ function initEditor(cb) { if(plaintext == 'none') { $("#profile-jot-text-loading").hide(); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); + $("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); editor = true; $("a#jot-perms-icon").fancybox({ 'transitionIn' : 'elastic', @@ -30,6 +31,7 @@ function initEditor(cb) { theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "center", theme_advanced_blockformats : "blockquote,code", + gecko_spellcheck : true, paste_text_sticky : true, entity_encoding : "raw", add_unload_trigger : false, @@ -296,7 +298,6 @@ function enableOnUser(){ } - function jotClearLocation() { $('#jot-coord').val(''); $('#profile-nolocation-wrapper').hide(); diff --git a/view/theme/dispy-dark/jot.tpl b/view/theme/dispy-dark/jot.tpl index 94c31da23..688ac1451 100644 --- a/view/theme/dispy-dark/jot.tpl +++ b/view/theme/dispy-dark/jot.tpl @@ -11,7 +11,7 @@ <input type="hidden" name="coord" id="jot-coord" value="" /> <input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> - + <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div> <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }} </textarea> diff --git a/view/theme/dispy-dark/nets.tpl b/view/theme/dispy-dark/nets.tpl index b322717ad..b0cb8890c 100644 --- a/view/theme/dispy-dark/nets.tpl +++ b/view/theme/dispy-dark/nets.tpl @@ -4,7 +4,7 @@ <a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a> <ul class="nets-ul"> {{ for $nets as $net }} - <li><a href="$base?f=&nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li> + <li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li> {{ endfor }} </ul> </div> diff --git a/view/theme/dispy-dark/saved_searches_aside.tpl b/view/theme/dispy-dark/saved_searches_aside.tpl index 63a85dda5..fb822fe5d 100644 --- a/view/theme/dispy-dark/saved_searches_aside.tpl +++ b/view/theme/dispy-dark/saved_searches_aside.tpl @@ -1,12 +1,12 @@ -<div id="saved-search-list" class="widget"> +<div class="widget" id="saved-search-list"> <h3 id="search">$title</h3> $searchbox <ul id="saved-search-ul"> {{ for $saved as $search }} <li class="saved-search-li clear"> - <a onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" class="icon savedsearchdrop drophide" href="network/?f=&remove=1&search=$search.encodedterm"></a> - <a class="savedsearchterm" href="network/?f=&search=$search.encodedterm">$search.term</a> + <a title="$search.delete" onclick="return confirmDelete();" onmouseout="imgdull(this);" onmouseover="imgbright(this);" id="drop-saved-search-term-$search.id" class="icon savedsearchdrop drophide" href="network/?f=&remove=1&search=$search.encodedterm"></a> + <a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&search=$search.encodedterm">$search.term</a> </li> {{ endfor }} </ul> diff --git a/view/theme/dispy-dark/search_item.tpl b/view/theme/dispy-dark/search_item.tpl index 54c3e389c..bfad1b7b7 100644 --- a/view/theme/dispy-dark/search_item.tpl +++ b/view/theme/dispy-dark/search_item.tpl @@ -1,10 +1,10 @@ -<div class="wall-item-outside-wrapper$item.indent" id="wall-item-outside-wrapper-$item.id" > +<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" > <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-info" id="wall-item-info-$item.id"> <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> - <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"> + <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"> <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a> <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span> <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id"> @@ -14,11 +14,21 @@ </div> </div> <div class="wall-item-photo-end"></div> - <div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div> + <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" > + {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div> + {{ else }}<div class="wall-item-lock"></div>{{ endif }} + <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div> + </div> </div> - <div class="wall-item-lock-wrapper"> - {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div> - {{ else }}<div class="wall-item-lock"></div>{{ endif }} + <div class="wall-item-author"> + <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> + <div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div> + + </div> + <div class="wall-item-content" id="wall-item-content-$item.id" > + <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div> + <div class="wall-item-title-end"></div> + <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div> </div> <div class="wall-item-tools" id="wall-item-tools-$item.id"> <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" > @@ -27,25 +37,18 @@ {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }} <div class="wall-item-delete-end"></div> </div> - <div class="wall-item-content" id="wall-item-content-$item.id" > - <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div> - <div class="wall-item-title-end"></div> - <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div> - </div> - <div class="wall-item-author"> - <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> - <div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div> - - </div> - </div> <div class="wall-item-wrapper-end"></div> -</div> -<div class="wall-item-outside-wrapper-end$item.indent" ></div> + <div class="wall-item-conv" id="wall-item-conv-$item.id" > {{ if $item.conv }} - <a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a> + <a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a> {{ endif }} </div> +<div class="wall-item-outside-wrapper-end$item.indent" ></div> + +</div> + + diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 5f9b38f8c..30d5cb8a9 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -444,10 +444,10 @@ div.jGrowl div.info { padding-left: 58px; } #nav-notifications-menu { - margin: 30px 0 0 -45px; - width: 300px; - max-height: 400px; - overflow: auto; + margin: 30px 0 0 -20px; + width: 275px; + max-height: 300px; + overflow-y: auto; font-size: 9pt; } #nav-notifications-menu .contactname { @@ -762,12 +762,20 @@ aside #viewcontacts { list-style: none; } #dfrn-request-link { - background:#3465A4 url(connect.png) no-repeat 95% center; - border-radius:5px 5px 5px 5px; - color:#fff; - display:block; - font-size:1.2em; - padding:.2em .5em; + background: #3465A4 url(connect.png) no-repeat 95% center; + border-radius: 5px 5px 5px 5px; + color: #eec; + display: block; + font-size: 1.2em; + padding: 0.2em 0.5em; +} +#wallmessage-link { + /*background: #3465A4 url(connect.png) no-repeat 95% center;*/ + /*border-radius: 5px 5px 5px 5px;*/ + color: #eee; + display: block; + font-size: 1.2em; + padding: 0.2em 0.5em; } #netsearch-box { margin: 20px 0px 30px; @@ -848,6 +856,16 @@ aside #viewcontacts { border-radius: 5px; vertical-align: middle; } +#jot-category { + margin: 5px 0; + border-radius: 5px; + border: 1px #999 solid; + color: #aaa; + font-size: smaller; +} +#jot-category:focus { + color: #eee; +} #jot #character-counter { width: 6%; float: right; @@ -1113,6 +1131,7 @@ section { } .shiny { background: #2e3436; + border-radius: 5px; } .wall-outside-wrapper .shiny { border-radius: 5px; @@ -2167,12 +2186,12 @@ div[id$="wrapper"] br { opacity: 1.0 !important; filter:alpha(opacity=100) !important; } -.filesavetags { +.filesavetags, .categorytags { margin: 20px 0; opacity: 0.5; filter:alpha(opacity=50); } -.filesavetags:hover { +.filesavetags:hover, .categorytags:hover { margin: 20px 0; opacity: 1.0 !important; filter:alpha(opacity=100) !important; diff --git a/view/theme/dispy-dark/wall_item.tpl b/view/theme/dispy-dark/wall_item.tpl index b54f753d3..8acaeaf02 100644 --- a/view/theme/dispy-dark/wall_item.tpl +++ b/view/theme/dispy-dark/wall_item.tpl @@ -1,10 +1,12 @@ -<div class="wall-item-outside-wrapper$item.indent" id="wall-item-outside-wrapper-$item.id" > +<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" > <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-info" id="wall-item-info-$item.id"> <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> - <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"><img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a> + <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"> + <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /> + </a> <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span> <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id"> <ul> @@ -16,10 +18,10 @@ <div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div> </div> <div class="wall-item-tools" id="wall-item-tools-$item.id"> - <div class="wall-item-lock-wrapper"> - {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div> - {{ else }}<div class="wall-item-lock"></div>{{ endif }} - </div> + <div class="wall-item-lock-wrapper"> + {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div> + {{ else }}<div class="wall-item-lock"></div>{{ endif }} + </div> <ul class="wall-item-subtools1"> {{ if $item.star }} <li> @@ -69,7 +71,6 @@ <div class="wall-item-author"> <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> <div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div> - </div> </div> <div class="wall-item-wrapper-end"></div> diff --git a/view/theme/dispy-dark/wallwall_item.tpl b/view/theme/dispy-dark/wallwall_item.tpl index b25d13409..421cddadf 100644 --- a/view/theme/dispy-dark/wallwall_item.tpl +++ b/view/theme/dispy-dark/wallwall_item.tpl @@ -22,43 +22,46 @@ <div class="wall-item-photo-end"></div> <div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div> </div> - <div class="wall-item-lock-wrapper"> + <div class="wall-item-tools" id="wall-item-tools-$item.id"> + <div class="wall-item-lock-wrapper"> {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div> {{ else }}<div class="wall-item-lock"></div>{{ endif }} - </div> - <div class="wall-item-tools" id="wall-item-tools-$item.id"> - {{ if $item.star }} - <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a> - <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a> - {{ endif }} - - {{ if $item.vote }} - <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id"> - <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a> - <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a> - - {{ if $item.vote.share }} - <a href="#" id="share-$item.id" -class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }} - <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> </div> - {{ endif }} + <ul class="wall-item-subtools1"> + {{ if $item.star }} + <li> + <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a> + <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a> + </li> + {{ endif }} + {{ if $item.vote }} + <li class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id"> + <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a> + <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a> + {{ if $item.vote.share }} + <a href="#" id="share-$item.id" +class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }} + <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> + </li> + {{ endif }} + </ul><br style="clear:left;" /> + <ul class="wall-item-subtools2"> {{ if $item.filer }} - <div class="wall-item-filer-wrapper"><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></div> + <li class="wall-item-filer-wrapper"><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li> {{ endif }} {{ if $item.plink }} - <div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div> + <li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li> {{ endif }} {{ if $item.edpost }} - <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a> + <li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li> {{ endif }} - <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" > + <li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" > {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }} - </div> {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }} + </li> + </ul> <div class="wall-item-delete-end"></div> - </div> <div class="wall-item-content" id="wall-item-content-$item.id" > <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div> @@ -70,7 +73,6 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick {{ endfor }} </div> </div> - </div> <div class="wall-item-author"> <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> |