harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace a bunch of graphic icons with vector icons

Browse Source
This commit is contained in:
friendica 2013-10-08 21:17:11 -07:00
parent f8d34a2aaf
commit 0e793dea9b
8 changed files with 54 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/ItemObject.php
View File

@ -75,7 +75,7 @@ class Item extends BaseObject {
$buttons = ''; $buttons = '';
$dropping = false; $dropping = false;
$star = false; $star = false;
$isstarred = "unstarred"; $isstarred = "unstarred icon-star-empty";
$indent = ''; $indent = '';
$osparkle = ''; $osparkle = '';
$total_children = $this->count_descendants(); $total_children = $this->count_descendants();
@ -147,7 +147,7 @@ class Item extends BaseObject {
'toggle' => t("toggle star status"), 'toggle' => t("toggle star status"),
'classdo' => (($item['item_flags'] & ITEM_STARRED) ? "hidden" : ""), 'classdo' => (($item['item_flags'] & ITEM_STARRED) ? "hidden" : ""),
'classundo' => (($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'), 'starred' => t('starred'),
); );

2
include/conversation.php
View File

@ -632,7 +632,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
); );
$star = false; $star = false;
$isstarred = "unstarred"; $isstarred = "unstarred icon-star-empty";
$lock = false; $lock = false;
$likebuttons = false; $likebuttons = false;

4
js/main.js
View File

@ -658,12 +658,16 @@ function updateConvItems(mode,data) {
if(data.result == 1) { if(data.result == 1) {
$('#starred-' + ident).addClass('starred'); $('#starred-' + ident).addClass('starred');
$('#starred-' + ident).removeClass('unstarred'); $('#starred-' + ident).removeClass('unstarred');
$('#starred-' + ident).addClass('icon-star-full');
$('#starred-' + ident).removeClass('icon-star-empty');
$('#star-' + ident).addClass('hidden'); $('#star-' + ident).addClass('hidden');
$('#unstar-' + ident).removeClass('hidden'); $('#unstar-' + ident).removeClass('hidden');
} }
else { else {
$('#starred-' + ident).addClass('unstarred'); $('#starred-' + ident).addClass('unstarred');
$('#starred-' + ident).removeClass('starred'); $('#starred-' + ident).removeClass('starred');
$('#starred-' + ident).addClass('icon-star-empty');
$('#starred-' + ident).removeClass('icon-star-full');
$('#star-' + ident).removeClass('hidden'); $('#star-' + ident).removeClass('hidden');
$('#unstar-' + ident).addClass('hidden'); $('#unstar-' + ident).addClass('hidden');
} }

14
view/theme/redbasic/css/style.css
View File

@ -916,6 +916,7 @@ footer {
} }
.wall-item-lock { .wall-item-lock {
font-size: 1.4em;
left: 105px; left: 105px;
position: absolute; position: absolute;
top: 1px; top: 1px;
@ -944,6 +945,8 @@ footer {
.item-tool { .item-tool {
float: left; float: left;
margin-right: 8px; margin-right: 8px;
font-size: 1.2em;
cursor: pointer;
} }
.like-rotator { .like-rotator {
@ -2694,11 +2697,14 @@ brain is weird like that */
.on { background-position: -144px -32px; } .on { background-position: -144px -32px; }
.off { background-position: 0px -48px; } .off { background-position: 0px -48px; }
.starred { background-position: -16px -48px; } /*.starred { background-position: -16px -48px; }
.unstarred { background-position: -32px -48px; } .unstarred { background-position: -32px -48px; }*/
.tagged { background-position: -48px -48px; } .tagged { background-position: -48px -48px; }
.yellow { background-position: -64px -48px; } .yellow { background-position: -64px -48px; }
.starred {
color: gold;
}
.filer-icon { .filer-icon {
display: block; width: 16px; height: 16px; display: block; width: 16px; height: 16px;
@ -3404,3 +3410,7 @@ margin-right: 50px;
.pmenu li { .pmenu li {
margin-left: -20px; margin-left: -20px;
} }
.comment-icon, .jot-icons {
font-size: 1.2em;
}

32
view/tpl/comment_item.tpl
View File

@ -16,30 +16,30 @@
</div> </div>
<div class="comment-edit-photo-end"></div> <div class="comment-edit-photo-end"></div>
<ul class="comment-edit-bb-{{$id}}"> <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}}" style="cursor: pointer;" title="{{$edbold}}"
onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li> onclick="insertFormatting('{{$comment}}','b', {{$id}});"></i></li>
<li><a class="editicon italicbb shadow" <li><i class="icon-italic shadow comment-icon"
style="cursor: pointer;" title="{{$editalic}}" style="cursor: pointer;" title="{{$editalic}}"
onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li> onclick="insertFormatting('{{$comment}}','i', {{$id}});"></i></li>
<li><a class="editicon underlinebb shadow" <li><i class="icon-underline shadow comment-icon"
style="cursor: pointer;" title="{{$eduline}}" style="cursor: pointer;" title="{{$eduline}}"
onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li> onclick="insertFormatting('{{$comment}}','u', {{$id}});"></i></li>
<li><a class="editicon quotebb shadow" <li><i class="icon-quote-left shadow comment-icon"
style="cursor: pointer;" title="{{$edquote}}" style="cursor: pointer;" title="{{$edquote}}"
onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li> onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></i></li>
<li><a class="editicon codebb shadow" <li><i class="icon-terminal shadow comment-icon"
style="cursor: pointer;" title="{{$edcode}}" style="cursor: pointer;" title="{{$edcode}}"
onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li> onclick="insertFormatting('{{$comment}}','code', {{$id}});"></i></li>
<li><a class="editicon imagebb shadow" <li><i class="icon-camera shadow comment-icon"
style="cursor: pointer;" title="{{$edimg}}" style="cursor: pointer;" title="{{$edimg}}"
onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li> onclick="insertFormatting('{{$comment}}','img', {{$id}});"></i></li>
<li><a class="editicon urlbb shadow" <li><i class="icon-link shadow comment-icon"
style="cursor: pointer;" title="{{$edurl}}" style="cursor: pointer;" title="{{$edurl}}"
onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li> onclick="insertFormatting('{{$comment}}','url', {{$id}});"></i></li>
<li><a class="editicon videobb shadow" <li><i class="icon-facetime-video shadow comment-icon"
style="cursor: pointer;" title="{{$edvideo}}" style="cursor: pointer;" title="{{$edvideo}}"
onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li> onclick="insertFormatting('{{$comment}}','video', {{$id}});"></i></li>
</ul> </ul>
<div class="comment-edit-bb-end"></div> <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> <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>

18
view/tpl/conv_item.tpl
View File

@ -31,7 +31,7 @@
</div> </div>
<div class="wall-item-photo-end"></div> <div class="wall-item-photo-end"></div>
<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" > <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}} {{else}}<div class="wall-item-lock"></div>{{/if}}
<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div> <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.verified}}<i class="icon-ok" title="{{$item.verified}}"></i>{{/if}}
@ -64,28 +64,28 @@
</div> </div>
<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}"> <div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
{{if $item.like}} {{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}}
{{if $item.dislike}} {{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}}
{{if $item.share}} {{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}}
{{if $item.plink}} {{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}}
{{if $item.edpost}} {{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}}
{{if $item.star}} {{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}}
{{if $item.tagger}} {{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}}
{{if $item.filer}} {{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}} {{/if}}
<div id="like-rotator-{{$item.id}}" class="like-rotator"></div> <div id="like-rotator-{{$item.id}}" class="like-rotator"></div>

14
view/tpl/jot.tpl
View File

@ -29,26 +29,26 @@
<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" /> <input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
<div id="profile-upload-wrapper" style="display: {{$visitor}};" > <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>
<div id="profile-attach-wrapper" style="display: {{$visitor}};" > <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>
<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" > <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>
<div id="profile-video-wrapper" style="display: {{$visitor}};" > <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>
<div id="profile-audio-wrapper" style="display: {{$visitor}};" > <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>
<div id="profile-location-wrapper" style="display: {{$visitor}};" > <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>
<div id="profile-nolocation-wrapper" style="display: none;" > <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>
<div id="profile-rotator-wrapper" style="display: {{$visitor}};" > <div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
<div id="profile-rotator"></div> <div id="profile-rotator"></div>

4
view/tpl/search_item.tpl
View File

@ -17,9 +17,11 @@
</div> </div>
<div class="wall-item-photo-end"></div> <div class="wall-item-photo-end"></div>
<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" > <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}} {{else}}<div class="wall-item-lock"></div>{{/if}}
<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div> <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> </div>
<div class="wall-item-author"> <div class="wall-item-author">