diff options
| -rw-r--r-- | include/ItemObject.php | 4 | ||||
| -rw-r--r-- | include/conversation.php | 2 | ||||
| -rw-r--r-- | js/main.js | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 14 | ||||
| -rwxr-xr-x | view/tpl/comment_item.tpl | 32 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 18 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 14 | ||||
| -rwxr-xr-x | view/tpl/search_item.tpl | 4 |
8 files changed, 54 insertions, 38 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index bf55b484a..df9386232 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -75,7 +75,7 @@ class Item extends BaseObject { $buttons = ''; $dropping = false; $star = false; - $isstarred = "unstarred"; + $isstarred = "unstarred icon-star-empty"; $indent = ''; $osparkle = ''; $total_children = $this->count_descendants(); @@ -147,7 +147,7 @@ class Item extends BaseObject { 'toggle' => t("toggle star status"), 'classdo' => (($item['item_flags'] & ITEM_STARRED) ? "hidden" : ""), 'classundo' => (($item['item_flags'] & ITEM_STARRED) ? "" : "hidden"), - 'isstarred' => (($item['item_flags'] & ITEM_STARRED) ? "starred" : "unstarred"), + 'isstarred' => (($item['item_flags'] & ITEM_STARRED) ? "starred icon-star" : "unstarred icon-star-empty"), 'starred' => t('starred'), ); diff --git a/include/conversation.php b/include/conversation.php index bcd9ae51a..1820a8568 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -632,7 +632,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { ); $star = false; - $isstarred = "unstarred"; + $isstarred = "unstarred icon-star-empty"; $lock = false; $likebuttons = false; diff --git a/js/main.js b/js/main.js index cd5040064..0604b81fb 100644 --- a/js/main.js +++ b/js/main.js @@ -658,12 +658,16 @@ function updateConvItems(mode,data) { if(data.result == 1) { $('#starred-' + ident).addClass('starred'); $('#starred-' + ident).removeClass('unstarred'); + $('#starred-' + ident).addClass('icon-star-full'); + $('#starred-' + ident).removeClass('icon-star-empty'); $('#star-' + ident).addClass('hidden'); $('#unstar-' + ident).removeClass('hidden'); } else { $('#starred-' + ident).addClass('unstarred'); $('#starred-' + ident).removeClass('starred'); + $('#starred-' + ident).addClass('icon-star-empty'); + $('#starred-' + ident).removeClass('icon-star-full'); $('#star-' + ident).removeClass('hidden'); $('#unstar-' + ident).addClass('hidden'); } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 96ea90c95..45d480528 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -916,6 +916,7 @@ footer { } .wall-item-lock { + font-size: 1.4em; left: 105px; position: absolute; top: 1px; @@ -944,6 +945,8 @@ footer { .item-tool { float: left; margin-right: 8px; + font-size: 1.2em; + cursor: pointer; } .like-rotator { @@ -2694,11 +2697,14 @@ brain is weird like that */ .on { background-position: -144px -32px; } .off { background-position: 0px -48px; } -.starred { background-position: -16px -48px; } -.unstarred { background-position: -32px -48px; } +/*.starred { background-position: -16px -48px; } +.unstarred { background-position: -32px -48px; }*/ .tagged { background-position: -48px -48px; } .yellow { background-position: -64px -48px; } +.starred { + color: gold; +} .filer-icon { display: block; width: 16px; height: 16px; @@ -3404,3 +3410,7 @@ margin-right: 50px; .pmenu li { margin-left: -20px; } + +.comment-icon, .jot-icons { + font-size: 1.2em; +}
\ No newline at end of file diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index f8add5d15..7b6113105 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -16,30 +16,30 @@ </div> <div class="comment-edit-photo-end"></div> <ul class="comment-edit-bb-{{$id}}"> - <li><a class="editicon boldbb shadow" + <li><i class="icon-bold shadow comment-icon" style="cursor: pointer;" title="{{$edbold}}" - onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li> - <li><a class="editicon italicbb shadow" + onclick="insertFormatting('{{$comment}}','b', {{$id}});"></i></li> + <li><i class="icon-italic shadow comment-icon" style="cursor: pointer;" title="{{$editalic}}" - onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li> - <li><a class="editicon underlinebb shadow" + onclick="insertFormatting('{{$comment}}','i', {{$id}});"></i></li> + <li><i class="icon-underline shadow comment-icon" style="cursor: pointer;" title="{{$eduline}}" - onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li> - <li><a class="editicon quotebb shadow" + onclick="insertFormatting('{{$comment}}','u', {{$id}});"></i></li> + <li><i class="icon-quote-left shadow comment-icon" style="cursor: pointer;" title="{{$edquote}}" - onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li> - <li><a class="editicon codebb shadow" + onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></i></li> + <li><i class="icon-terminal shadow comment-icon" style="cursor: pointer;" title="{{$edcode}}" - onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li> - <li><a class="editicon imagebb shadow" + onclick="insertFormatting('{{$comment}}','code', {{$id}});"></i></li> + <li><i class="icon-camera shadow comment-icon" style="cursor: pointer;" title="{{$edimg}}" - onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li> - <li><a class="editicon urlbb shadow" + onclick="insertFormatting('{{$comment}}','img', {{$id}});"></i></li> + <li><i class="icon-link shadow comment-icon" style="cursor: pointer;" title="{{$edurl}}" - onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li> - <li><a class="editicon videobb shadow" + onclick="insertFormatting('{{$comment}}','url', {{$id}});"></i></li> + <li><i class="icon-facetime-video shadow comment-icon" style="cursor: pointer;" title="{{$edvideo}}" - onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li> + onclick="insertFormatting('{{$comment}}','video', {{$id}});"></i></li> </ul> <div class="comment-edit-bb-end"></div> <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen(this, {{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose(this,{{$id}});" >{{$comment}}</textarea> diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index b5fd9f3b7..09d0b5d57 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -31,7 +31,7 @@ </div> <div class="wall-item-photo-end"></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> + {{if $item.lock}}<i class="wall-item-lock icon-lock lockview" title="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" ></i> {{else}}<div class="wall-item-lock"></div>{{/if}} <div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div> {{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i>{{/if}} @@ -64,28 +64,28 @@ </div> <div class="wall-item-tools" id="wall-item-tools-{{$item.id}}"> {{if $item.like}} - <a href="#" class="icon like item-tool" title="{{$item.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a> + <i class="icon-thumbs-up-alt item-tool" title="{{$item.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></i> {{/if}} {{if $item.dislike}} - <a href="#" class="icon dislike item-tool" title="{{$item.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a> + <i class="icon-thumbs-down-alt item-tool" title="{{$item.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></i> {{/if}} {{if $item.share}} - <a href="#" class="icon recycle item-tool" title="{{$item.share.0}}" onclick="jotShare({{$item.id}}); return false"></a> + <i class="icon-retweet item-tool" title="{{$item.share.0}}" onclick="jotShare({{$item.id}}); return false"></i> {{/if}} {{if $item.plink}} - <a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon item-tool remote-link{{$item.sparkle}}"></a> + <i class="icon-external-link item-tool" onclick="window.location.href='{{$item.plink.href}}'; return false;" title="{{$item.plink.title}}"></i> {{/if}} {{if $item.edpost}} - <a class="editpost icon pencil item-tool" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a> + <i class="editpost icon-pencil item-tool" onclick="window.location.href='{{$item.edpost.0}}'; return false;" title="{{$item.edpost.1}}"></i> {{/if}} {{if $item.star}} - <a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon item-tool {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></a> + <i id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item item-tool {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{/if}} {{if $item.tagger}} - <a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon item-tool tagged" title="{{$item.tagger.tagit}}"></a> + <i id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon-tag item-tool" title="{{$item.tagger.tagit}}"></i> {{/if}} {{if $item.filer}} - <a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon item-tool" title="{{$item.filer}}"></a> + <i id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item icon-folder-open item-tool" title="{{$item.filer}}"></i> {{/if}} <div id="like-rotator-{{$item.id}}" class="like-rotator"></div> diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 9a93e5291..12978038c 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -29,26 +29,26 @@ <input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" /> <div id="profile-upload-wrapper" style="display: {{$visitor}};" > - <div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div> + <div id="wall-image-upload-div" ><i id="wall-image-upload" class="icon-camera jot-icons" title="{{$upload}}"></i></div> </div> <div id="profile-attach-wrapper" style="display: {{$visitor}};" > - <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div> + <div id="wall-file-upload-div" ><i id="wall-file-upload" class="icon-paper-clip jot-icons" title="{{$attach}}"></i></div> </div> <div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" > - <a id="profile-link" class="icon link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a> + <i id="profile-link" class="icon-link jot-icons" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></i> </div> <div id="profile-video-wrapper" style="display: {{$visitor}};" > - <a id="profile-video" class="icon video" title="{{$video}}" onclick="jotVideoURL();return false;"></a> + <i id="profile-video" class="icon-facetime-video jot-icons" title="{{$video}}" onclick="jotVideoURL();return false;"></i> </div> <div id="profile-audio-wrapper" style="display: {{$visitor}};" > - <a id="profile-audio" class="icon audio" title="{{$audio}}" onclick="jotAudioURL();return false;"></a> + <i id="profile-audio" class="icon-volume-up jot-icons" title="{{$audio}}" onclick="jotAudioURL();return false;"></i> </div> <div id="profile-location-wrapper" style="display: {{$visitor}};" > - <a id="profile-location" class="icon globe" title="{{$setloc}}" onclick="jotGetLocation();return false;"></a> + <i id="profile-location" class="icon-globe jot-icons" title="{{$setloc}}" onclick="jotGetLocation();return false;"></i> </div> <div id="profile-nolocation-wrapper" style="display: none;" > - <a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a> + <i id="profile-nolocation" class="icon-circle-blank jot-icons" title="{{$noloc}}" onclick="jotClearLocation();return false;"></i> </div> <div id="profile-rotator-wrapper" style="display: {{$visitor}};" > <div id="profile-rotator"></div> diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index bb796346d..c1c84fc41 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -17,9 +17,11 @@ </div> <div class="wall-item-photo-end"></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> + {{if $item.lock}}<i class="wall-item-lock icon-lock lockview" title="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></i> {{else}}<div class="wall-item-lock"></div>{{/if}} <div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div> + {{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i>{{/if}} + {{if $item.unverified}}<img src="images/unlock_icon.gif" alt="{{$item.unverified}}" title="{{$item.unverified}}" height="10" width="10" />{{/if}} </div> </div> <div class="wall-item-author"> |