diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 87 | ||||
| -rw-r--r-- | view/theme/redbasic/php/config.php | 11 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 60 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/dark.php | 10 | ||||
| -rw-r--r-- | view/theme/redbasic/tpl/theme_settings.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/dir_sort_links.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/field_acheckbox.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/generic_links_widget.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/item_attach.tpl | 6 | ||||
| -rw-r--r-- | view/tpl/item_categories.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/item_filer.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/mail_conv.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/mail_display.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/mail_list.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/menulist.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/prv_message.tpl | 6 | ||||
| -rw-r--r-- | view/tpl/webpagelist.tpl | 11 | ||||
| -rwxr-xr-x | view/tpl/xchan_vcard.tpl | 4 |
19 files changed, 176 insertions, 61 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f1f58cc44..669f73f42 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -74,6 +74,7 @@ blockquote { background-color: #f4f8f9; border-left: 4px solid #dae4ee; padding: 0.4em; + color: #000; } .ccollapse-wrapper { @@ -124,6 +125,8 @@ nav {background-image: linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); background-image: -ms-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); } +section {width: $section_width; +} nav:hover {background-image: linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); background-image: -o-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); @@ -368,7 +371,7 @@ footer { margin-bottom: 10px; } -.group-selected, .nets-selected, .fileas-selected, .categories-selected, .settings-widget .active { +.group-selected, .nets-selected, .fileas-selected, .categories-selected, .active { color: #444444 !important; } @@ -926,7 +929,7 @@ footer { } .wall-item-ago { - color: #888888; + color: #777; font-size: 0.8em; } @@ -947,6 +950,11 @@ footer { margin-right: 8px; font-size: 1.2em; cursor: pointer; + color: #777; +} + +.item-tool:hover { + color: #000; } .like-rotator { @@ -1481,12 +1489,6 @@ tr.mceLast { box-shadow: 0 0 0 0; } -.settings-widget .selected { - border-radius: $radiuspx; - -moz-border-radius: $radiuspx; - box-shadow: 4px 4px 3px 0 #444444; -} - #sidebar-page-list .label { margin-left: 5px; } @@ -1826,6 +1828,12 @@ a.mail-list-link { margin-right: 30px; margin-top: 15px; } +.mail-conv-recall-wrapper { + float: right; + margin-right: 10px; + margin-top: 15px; +} + .mail-conv-break { clear: both; } @@ -3311,9 +3319,8 @@ ul.menu-popup { #mail-list-wrapper { - -border-bottom: 1px solid #ccc; -padding: 20px; +border-top: 1px solid #ccc; +padding: 5px 5px 5px 5px; } span.mail-list { @@ -3321,6 +3328,10 @@ float: left; width: 20%; } +.mail-list-remove { +width: 5% !important; +} + span.mail-delete { float: left; width: 30px; @@ -3329,6 +3340,10 @@ width: 30px; img.mail-list-sender-photo { height: 24px; width: 24px; +float: left; +margin-right: 30px; +-moz-border-radius: $radiuspx; +border-radius: $radiuspx; } .tag1 { @@ -3422,19 +3437,65 @@ margin-right: 50px; margin-left: -20px; } -.comment-icon, .jot-icons { +.comment-icon, +.jot-icons { font-size: 1.2em; + color: #777; } + +.comment-icon:hover, +.jot-icons:hover { + color: #000; +} + .nav-icon { font-size: 1.4em; margin-right: 15px; } a .drop-icons { - color: #000000; + color: #777; font-size: 1.2em; } .drop-icons:hover { color: #FF0000; } + +.permission-inherited { + float: left; + margin-right: 10px; + color: #FF0000; +} + +.attachlink { + float: left; + border: 1px solid black; + padding: 5px; + margin-right: 8px; +} + +.attach-icons { + font-size: 1.4em; +} + +.attach-clip { + margin-right: 3px; + font-size: 1.8em; +} + +.item-category { + margin-right: 10px; +} + +.design-icons { + margin-right: 10px; +} + +.design-icons:hover { +text-decoration: none; +} + +#menulist { + list-style-type: none; +}
\ No newline at end of file diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index be021e85c..053940219 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -5,7 +5,7 @@ function theme_content(&$a) { $schema = get_pconfig(local_user(),'redbasic', 'schema' ); $nav_colour = get_pconfig(local_user(),'redbasic', 'nav_colour' ); - $bgcolour = get_pconfig(local_user(),'redbasic', 'bgcolour' ); + $bgcolour = get_pconfig(local_user(),'redbasic', 'background_colour' ); $background_image = get_pconfig(local_user(),'redbasic', 'background_image' ); $item_colour = get_pconfig(local_user(),'redbasic', 'item_colour' ); $item_opacity = get_pconfig(local_user(),'redbasic', 'item_opacity' ); @@ -13,8 +13,9 @@ function theme_content(&$a) { $font_colour = get_pconfig(local_user(),'redbasic', 'font_colour' ); $radius = get_pconfig(local_user(),'redbasic', 'radius' ); $shadow = get_pconfig(local_user(),'redbasic', 'photo_shadow' ); + $section_width=get_pconfig(local_user(),"redbasic","section_width"); return redbasic_form($a, $schema, $nav_colour, $bgcolour, $background_image, $item_colour, $item_opacity, - $font_size, $font_colour, $radius, $shadow); + $font_size, $font_colour, $radius, $shadow, $section_width); } function theme_post(&$a) { @@ -31,15 +32,16 @@ function theme_post(&$a) { set_pconfig(local_user(), 'redbasic', 'font_colour', $_POST['redbasic_font_colour']); set_pconfig(local_user(), 'redbasic', 'radius', $_POST['redbasic_radius']); set_pconfig(local_user(), 'redbasic', 'photo_shadow', $_POST['redbasic_shadow']); + set_pconfig(local_user(), 'redbasic', 'section_width', $_POST['redbasic_section_width']); } } function redbasic_form(&$a, $schema, $nav_colour, $bgcolour, $background_image, $item_colour, $item_opacity, - $font_size, $font_colour, $radius, $shadow) { + $font_size, $font_colour, $radius, $shadow, $section_width) { $scheme_choices = array(); $scheme_choices["---"] = t("Default"); - $files = glob('view/theme/' . current_theme() . '/schema/*'); + $files = glob('view/theme/redbasic/schema/*.php'); if($files) { foreach($files as $file) { $f = basename($file, ".php"); @@ -75,6 +77,7 @@ if(feature_enabled(local_user(),'expert')) '$font_colour' => array('redbasic_font_colour', t('Set font-colour for posts and comments'), $font_colour), '$radius' => array('redbasic_radius', t('Set radius of corners'), $radius), '$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $shadow), + '$section_width' => array('redbasic_section_width',t('Set width of main section'),$section_width), )); return $o; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index b80a3e764..c4bd2e15a 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -1,5 +1,4 @@ <?php - // Get the UID of the channel owner $uid = get_theme_uid(); @@ -11,25 +10,6 @@ // A further two - $nav_bg_3 and $nav_bg_4 are used to create the hover, if any particular scheme // wants to implement that $nav_colour = get_pconfig($uid, "redbasic", "nav_colour"); - if ($nav_colour == "red") { - $nav_bg_1 = "#f88"; - $nav_bg_2 = "#b00"; - $nav_bg_3 = "#f00"; - $nav_bg_4 = "#b00"; - $search_background = '#FFDDDD'; - $active_colour = '#444444'; - } - - if ($nav_colour == "black") { - $nav_bg_1 = $nav_bg_3 = "#000"; - $nav_bg_2 = $nav_bg_4 = "#222"; - $search_background = '#EEEEEE'; - $active_colour = '#AAAAAA'; - } - if ($nav_colour == "silver") { - $nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver"; - $search_background = '#EEEEEE'; - } // Load the owners pconfig $schema = get_pconfig($uid,'redbasic','schema'); @@ -41,6 +21,7 @@ $font_colour = get_pconfig($uid, "redbasic", "font_colour"); $radius = get_pconfig($uid, "redbasic", "radius"); $shadow = get_pconfig($uid,"redbasic","photo_shadow"); + $section_width=get_pconfig($uid,"redbasic","section_width"); // Now load the scheme. If a value is changed above, we'll keep the settings // If not, we'll keep those defined by the schema @@ -48,14 +29,14 @@ // not --- like the mobile theme does instead. if (($schema) && ($schema != '---')) { - $schemefile = 'view/theme/' . current_theme() . '/schema/' . $schema . '.php'; + $schemefile = 'view/theme/redbasic/schema/' . $schema . '.php'; require_once ($schemefile); } // If we haven't got a schema, load the default. We shouldn't touch this - we // should leave it for admins to define for themselves. if (! $schema) { - if(file_exists('view/theme/' . current_theme() . '/schema/default.php')) { - $schemefile = 'view/theme/' . current_theme() . '/schema/' . 'default.php'; + if(file_exists('view/theme/redbasic/schema/default.php')) { + $schemefile = 'view/theme/redbasic/schema/' . 'default.php'; require_once ($schemefile); } } @@ -89,11 +70,37 @@ $shadow = "0"; if(! $active_colour) $active_colour = '#FFFFFF'; + if (! $section_width) + $section_width="72%"; + + +// Nav colours have nested values, so we have to define the actual variables +// used in the CSS from the higher level "red", "black", etc here + if ($nav_colour == "red") { + $nav_bg_1 = "#f88"; + $nav_bg_2 = "#b00"; + $nav_bg_3 = "#f00"; + $nav_bg_4 = "#b00"; + $search_background = '#FFDDDD'; + $active_colour = '#444444'; + } + if ($nav_colour == "black") { + $nav_bg_1 = $nav_bg_3 = "#000"; + $nav_bg_2 = $nav_bg_4 = "#222"; + $search_background = '#EEEEEE'; + $active_colour = '#AAAAAA'; + } + if ($nav_colour == "silver") { + $nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver"; + $search_background = '#EEEEEE'; + } + + // Apply the settings - if(file_exists('view/theme/' . current_theme() . '/css/style.css')) { - $x = file_get_contents('view/theme/' . current_theme() . '/css/style.css'); + if(file_exists('view/theme/redbasic/css/style.css')) { + $x = file_get_contents('view/theme/redbasic/css/style.css'); $options = array ( '$nav_bg_1' => $nav_bg_1, @@ -109,7 +116,8 @@ $options = array ( '$font_colour' => $font_colour, '$radius' => $radius, '$shadow' => $shadow, -'$active_colour' => $active_colour +'$active_colour' => $active_colour, +'$section_width' => $section_width ); echo str_replace(array_keys($options), array_values($options), $x); diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php new file mode 100644 index 000000000..bd3642914 --- /dev/null +++ b/view/theme/redbasic/schema/dark.php @@ -0,0 +1,10 @@ +<?php + + if (! $nav_colour) + $nav_colour = "black"; + if (! $bgcolour) + $bgcolour = '#010101'; + if (! $item_colour) + $item_colour = '#111'; + if (! $font_colour) + $font_colour = '#fff'; diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index 45dd529fa..4e4b6002c 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -13,7 +13,7 @@ {{include file="field_input.tpl" field=$font_colour}} {{include file="field_input.tpl" field=$radius}} {{include file="field_input.tpl" field=$shadow}} - +{{include file="field_input.tpl" field=$section_width}} <div class="settings-submit-wrapper"> <input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" /> </div> diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index c44e2253a..095bd0df3 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -37,7 +37,7 @@ </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>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br /> + <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>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}<br /> <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div> </div> diff --git a/view/tpl/dir_sort_links.tpl b/view/tpl/dir_sort_links.tpl new file mode 100644 index 000000000..58498e4d8 --- /dev/null +++ b/view/tpl/dir_sort_links.tpl @@ -0,0 +1,6 @@ +<div class="widget" id="dir_sort_links"> +<h3>{{$header}}</h3> +<a href="directory?f=&order=">{{$normal}}</a><br /> +<a href="directory?f=&order=reverse">{{$reverse}}</a><br /> +<a href="directory?f=&order=date">{{$date}}</a><br /> +</div> diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index cb63f7ca2..f5dda4cc0 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -1,6 +1,6 @@ <div class='field acheckbox'> <label for='id_{{$field.0}}'>{{$field.1}}</label> <input type="checkbox" class="abook-edit-them" name='them_{{$field.0}}' id='them_id_{{$field.0}}' value="1" disabled="disabled" {{if $field.2}}checked="checked"{{/if}} /> - <input type="checkbox" class="abook-edit-me" name='{{$field.0}}' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} {{if $field.5}} disabled="disabled" {{/if}}/> + <input type="checkbox" class="abook-edit-me" name='{{$field.0}}' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} />{{if $field.5}} <span class="permission-inherited">{{$inherited}}</span> {{/if}} <span class='field_abook_help'>{{$field.6}}</span> </div> diff --git a/view/tpl/generic_links_widget.tpl b/view/tpl/generic_links_widget.tpl index 8b4c67b6f..5ae52aa8a 100755 --- a/view/tpl/generic_links_widget.tpl +++ b/view/tpl/generic_links_widget.tpl @@ -4,7 +4,7 @@ <ul> {{foreach $items as $item}} - <li class="tool"><a href="{{$item.url}}" class="{{if $item.selected}}selected{{/if}}">{{$item.label}}</a></li> + <li class="tool"><a href="{{$item.url}}" class="{{if $item.selected}}active{{/if}}">{{$item.label}}</a></li> {{/foreach}} </ul> diff --git a/view/tpl/item_attach.tpl b/view/tpl/item_attach.tpl new file mode 100644 index 000000000..25c127a15 --- /dev/null +++ b/view/tpl/item_attach.tpl @@ -0,0 +1,6 @@ +<div class="body-attach"> +{{foreach $attaches as $a}} +<a href="{{$a.url}}" title="{{$a.title}}" class="attachlink" ><i class="icon-paper-clip attach-icons attach-clip"></i><i class="{{$a.icon}} attach-icons"></i></a> +{{/foreach}} +<div class="clear"></div> +</div> diff --git a/view/tpl/item_categories.tpl b/view/tpl/item_categories.tpl new file mode 100644 index 000000000..ec2639a6f --- /dev/null +++ b/view/tpl/item_categories.tpl @@ -0,0 +1,8 @@ +{{if $categories}} +<div class="categorytags"> +{{foreach $categories as $cat}} +<span class="item-category"><i class="icon-asterisk cat-icons"></i> {{if $cat.url}}<a href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span> +{{/foreach}} +</div> +{{/if}} + diff --git a/view/tpl/item_filer.tpl b/view/tpl/item_filer.tpl new file mode 100644 index 000000000..0e68a172a --- /dev/null +++ b/view/tpl/item_filer.tpl @@ -0,0 +1,8 @@ +{{if $categories}} +<div class="filesavetags"> +{{foreach $categories as $cat}} +<span class="item-category"><i class="icon-folder-close cat-icons"></i> {{$cat.term}} <a href="{{$cat.removelink}}" class="category-remove-link" title="{{$remove}}"><i class="icon-remove drop-icons"></i></a></span> +{{/foreach}} +</div> +{{/if}} + diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index bfa9491f4..84bdb451a 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -4,10 +4,14 @@ <div class="mail-conv-sender-name" >{{$mail.from_name}}</div> </div> <div class="mail-conv-detail" > + {{if $mail.is_recalled}}<strong>{{$mail.is_recalled}}</strong>{{/if}} <div class="mail-conv-date">{{$mail.date}}</div> <div class="mail-conv-subject">{{$mail.subject}}</div> <div class="mail-conv-body">{{$mail.body}}</div> - <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div> + <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" ><i class="icon-remove mail-icons drop-icons"></i></a></div><div class="mail-conv-delete-end"></div> + {{if $mail.can_recall}} + <div class="mail-conv-recall-wrapper" id="mail-conv-recall-wrapper-{{$mail.id}}" ><a href="message/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="mail-conv-recall-icon" ><i class="icon-undo mail-icons drop-icons"></i></a></div><div class="mail-conv-recall-end"></div> + {{/if}} <div class="mail-conv-outside-wrapper-end"></div> </div> </div> diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl index 7280f1e84..523a9160a 100755 --- a/view/tpl/mail_display.tpl +++ b/view/tpl/mail_display.tpl @@ -1,3 +1,4 @@ +<h3>{{$prvmsg_header}}</h3> <div class="generic-content-wrapper"> {{foreach $mails as $mail}} {{include file="mail_conv.tpl"}} diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index 4d8a744ac..24966ad1d 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -1,7 +1,8 @@ <div class="generic-content-wrapper" id="mail-list-wrapper"> - <span class="mail-delete"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" class="icon drophide mail-list-delete delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></span> <a href="{{$from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a> <span class="mail-list">{{$from_name}}</span> <span class="mail-list" {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span> <span class="mail-list" title="{{$date}}">{{$date}}</span> + <span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span> + <div class="clear"> </div> </div> diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl index 19428aca2..271bace82 100644 --- a/view/tpl/menulist.tpl +++ b/view/tpl/menulist.tpl @@ -7,7 +7,7 @@ {{if $menus }} <ul id="menulist"> {{foreach $menus as $m }} -<li><a href="menu/{{$m.menu_id}}" title="{{$hintedit}}">{{$edit}}</a> | <a href="menu/{{$m.menu_id}}/drop" title={{$hintdrop}}>{{$drop}}</a> <a href="mitem/{{$m.menu_id}}/new" title="{{$hintcontent}}">{{$m.menu_name}}</a></li> +<li><a href="menu/{{$m.menu_id}}" title="{{$hintedit}}"><i class="icon-pencil design-icons design-edit-icon"></i></a> <a href="menu/{{$m.menu_id}}/drop" title={{$hintdrop}}><i class="icon-remove drop-icons design-icons design-remove-icon"></i></a> <a href="mitem/{{$m.menu_id}}/new" title="{{$hintcontent}}">{{$m.menu_name}}</a></li> {{/foreach}} </ul> {{/if}} diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index 164ba0c6d..d65bc3570 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -24,16 +24,16 @@ <div id="prvmail-submit-wrapper" > <input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" /> <div id="prvmail-upload-wrapper" > - <div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div> + <i id="prvmail-upload" class="icon-camera jot-icons" title="{{$upload}}"></i> </div> <div id="prvmail-attach-wrapper" > - <div id="prvmail-attach" class="icon attach" title="{{$attach}}" ></div> + <i id="prvmail-attach" class="icon-paper-clip jot-icons" title="{{$attach}}"></i> </div> <div id="prvmail-link-wrapper" > - <div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div> + <i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" onclick="jotGetLink(); return false;"></i> </div> <div id="prvmail-rotator-wrapper" > <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /> diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index 9a189230b..437e93348 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -6,12 +6,11 @@ {{foreach $pages as $key => $items}} {{foreach $items as $item}} <div class="page-list-item"> - {{if $edit}}<a href="{{$baseurl}}/{{$item.url}}">{{$edit}}</a> | {{/if}} - {{if $view}}<a href="page/{{$channel}}/{{$item.title}}">{{$view}}</a> {{$item.title}} | {{/if}} - {{if $preview}} <a href="page/{{$channel}}/{{$item.title}}?iframe=true&width=80%&height=80%" rel="prettyPhoto[iframes]">Preview</a> {{/if}} - {{if $widget}}<a href="page/{{$channel}}/{{$item.title}}">{{$item.title}}</a>{{/if}} - -</div> + {{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon"></i></a> {{/if}} + {{if $view}}<a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon"></i></a> {{/if}} + {{if $preview}}<a href="page/{{$channel}}/{{$item.title}}?iframe=true&width=80%&height=80%" rel="xprettyPhoto[iframesx]" title="{{$preview}}"><i class="icon-eye-open design-icons design-preview-icon"></i></a> {{/if}} + {{$item.title}} + </div> {{/foreach}} {{/foreach}} </div> diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl index 3dabdad95..ac2eaf7ae 100755 --- a/view/tpl/xchan_vcard.tpl +++ b/view/tpl/xchan_vcard.tpl @@ -4,7 +4,7 @@ </div> - +{{if $mode != 'mail'}} <div id="profile-extra-links"> <ul> {{if $connect}} @@ -17,4 +17,4 @@ </div> - +{{/if}} |