diff options
| -rw-r--r-- | view/theme/redbasic/css/style.css | 20 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 10 | ||||
| -rwxr-xr-x | view/tpl/conv_frame.tpl | 9 | ||||
| -rwxr-xr-x | view/tpl/conversation.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/event.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/group_drop.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/group_side.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/install_checks.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/lang_selector.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/profile_vcard.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/threaded_conversation.tpl | 8 |
11 files changed, 23 insertions, 48 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 029a15978..36e147502 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -458,6 +458,14 @@ footer { clear: both; } +.vcard-profile-edit-icon { + font-size: 1.2em; +} +.vcard-profile-edit-icon:hover { + text-decoration: none; +} + + #profile-extra-links { clear: both; margin-top: 10px; @@ -589,11 +597,6 @@ footer { margin-bottom: 10px; } -.contact-entry-direction-icon { - margin-top: 24px; - margin-right: 2px; -} - .contact-entry-photo img { border: none; } @@ -638,11 +641,7 @@ footer { margin-left: 50px; } -/* might be obsolete -.wall-item-delete-icon { - border: none; -} -*/ + /* might be obsolete #profile-youtube-wrapper { @@ -2697,6 +2696,7 @@ text-decoration: none; list-style-type: none; } +.group-edit-icon, .savedsearchdrop { opacity: 0; } diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index e40a94fcc..12ff2c6fe 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -20,19 +20,19 @@ $(document).ready(function() { $('.group-edit-icon').hover( function() { - $(this).addClass('icon'); $(this).removeClass('iconspacer');}, + $(this).css('opacity','1.0');}, function() { - $(this).removeClass('icon'); $(this).addClass('iconspacer');} - ); + $(this).css('opacity','0');} +); $('.sidebar-group-element').hover( function() { id = $(this).attr('id'); - $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');}, + $('#edit-' + id).css('opacity','1.0');}, function() { id = $(this).attr('id'); - $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');} + $('#edit-' + id).css('opacity','0');} ); diff --git a/view/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl index 596246708..aa7b55e9b 100755 --- a/view/tpl/conv_frame.tpl +++ b/view/tpl/conv_frame.tpl @@ -1,14 +1,5 @@ <div id="threads-begin"></div> <div id="threads-end"></div> <div id="conversation-end"></div> - -{{if $dropping}} -<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();"> - <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div> - <div id="item-delete-selected-desc" >{{$dropping}}</div> -</div> -<div id="item-delete-selected-end"></div> -{{/if}} - <div id="page-spinner"></div> diff --git a/view/tpl/conversation.tpl b/view/tpl/conversation.tpl index 8948fd474..97d64327a 100755 --- a/view/tpl/conversation.tpl +++ b/view/tpl/conversation.tpl @@ -18,11 +18,3 @@ {{/foreach}} <div id="threads-end"></div> <div id="conversation-end"></div> - -{{if $dropping}} -<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();"> - <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div> - <div id="item-delete-selected-desc" >{{$dropping}}</div> -</div> -<div id="item-delete-selected-end"></div> -{{/if}} diff --git a/view/tpl/event.tpl b/view/tpl/event.tpl index 58a19eb76..e0977e262 100755 --- a/view/tpl/event.tpl +++ b/view/tpl/event.tpl @@ -3,8 +3,8 @@ {{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}" height="32" width="32" />{{$event.item.author.xchan_name}}</a>{{/if}} {{$event.html}} - {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link icon s22 remote-link"></a>{{/if}} - {{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}} + {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link"><i class="icon-external-link" ></i></a>{{/if}} + {{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link"><i class="icon-pencil"></i></a>{{/if}} </div> <div class="clear"></div> {{/foreach}} diff --git a/view/tpl/group_drop.tpl b/view/tpl/group_drop.tpl index 670136db7..8cc9ab324 100755 --- a/view/tpl/group_drop.tpl +++ b/view/tpl/group_drop.tpl @@ -2,8 +2,8 @@ <a href="group/drop/{{$id}}?t={{$form_security_token}}" onclick="return confirmDelete();" id="group-delete-icon-{{$id}}" - class="icon drophide group-delete-icon" + class="group-delete-icon" onmouseover="imgbright(this);" - onmouseout="imgdull(this);" ></a> + onmouseout="imgdull(this);" ><i class="icon-remove drop-icons"></i></a> </div> <div class="group-delete-end"></div> diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl index d2d8a77e2..a0ed7a82d 100755 --- a/view/tpl/group_side.tpl +++ b/view/tpl/group_side.tpl @@ -13,7 +13,7 @@ /> {{/if}} {{if $group.edit}} - <a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><span id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer small-pencil"></span></a> + <a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><i id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer icon-pencil"></i></a> {{/if}} <a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a> </li> diff --git a/view/tpl/install_checks.tpl b/view/tpl/install_checks.tpl index 2068df916..2f773f746 100755 --- a/view/tpl/install_checks.tpl +++ b/view/tpl/install_checks.tpl @@ -3,7 +3,7 @@ <form action="{{$baseurl}}/index.php?q=setup" method="post"> <table> {{foreach $checks as $check}} - <tr><td>{{$check.title}} </td><td><span class="icon s22 {{if $check.status}}on{{else}}{{if $check.required}}off{{else}}yellow{{/if}}{{/if}}"></td><td>{{if $check.required}}(required){{/if}}</td></tr> + <tr><td>{{$check.title}} </td><td><i class="{{if $check.status}}icon-check{{else}}{{if $check.required}}icon-check-empty{{else}}icon-exclamation{{/if}}{{/if}}"></i></td><td>{{if $check.required}}(required){{/if}}</td></tr> {{if $check.help}} <tr><td colspan="3"><blockquote>{{$check.help}}</blockquote></td></tr> {{/if}} diff --git a/view/tpl/lang_selector.tpl b/view/tpl/lang_selector.tpl index 945cbf51e..159eeea7e 100755 --- a/view/tpl/lang_selector.tpl +++ b/view/tpl/lang_selector.tpl @@ -1,4 +1,4 @@ -<div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div> +<div id="lang-select-icon" title="{{$title}}" onclick="openClose('language-selector');" ><i class="icon-flag"></i></div> <div id="language-selector" style="display: none;" > <form action="#" method="post" > <select name="system_language" onchange="this.form.submit();" > diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 31f601d86..aaee02ab5 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -2,7 +2,7 @@ {{if $profile.edit}} <div class="action"> - <a class="profile-edit-side-link icon edit" rel="#profiles-menu" title="{{$profile.edit.3}}" href="#" ><span>{{$profile.edit.1}}</span></a> + <a class="profile-edit-side-link" rel="#profiles-menu" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil vcard-profile-edit-icon" title="{{$profile.edit.1}}" ></i></a> <ul id="profiles-menu" class="menu-popup"> {{foreach $profile.menu.entries as $e}} <li> diff --git a/view/tpl/threaded_conversation.tpl b/view/tpl/threaded_conversation.tpl index 2d71f01ab..ea5c3c281 100755 --- a/view/tpl/threaded_conversation.tpl +++ b/view/tpl/threaded_conversation.tpl @@ -6,11 +6,3 @@ {{/foreach}} <div id="conversation-end"></div> - -{{if $dropping}} -<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();"> - <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div> - <div id="item-delete-selected-desc" >{{$dropping}}</div> -</div> -<div id="item-delete-selected-end"></div> -{{/if}} |