diff options
30 files changed, 202 insertions, 198 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index f650f0831..f0687e51e 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -907,12 +907,12 @@ function get_diaspora_reshare_xml($url,$recurse = 0) { $x = z_fetch_url($url); if(! $x['success']) - $x = z_fetch_url(str_replace('https://','http://',$source_url)); + $x = z_fetch_url(str_replace('https://','http://',$url)); if(! $x['success']) { - logger('get_diaspora_reshare_xml: unable to fetch source url ' . $source_url); + logger('get_diaspora_reshare_xml: unable to fetch source url ' . $url); return; } - logger('diaspora_reshare: source: ' . $x['body'], LOGGER_DATA); + logger('get_diaspora_reshare_xml: source: ' . $x['body'], LOGGER_DEBUG); $source_xml = parse_xml_string($x['body'],false); diff --git a/include/items.php b/include/items.php index 730d81268..c9810bb7c 100755 --- a/include/items.php +++ b/include/items.php @@ -1570,7 +1570,7 @@ function get_atom_elements($feed,$item,&$author) { // We could probably turn these old Friendica bbcode bookmarks into bookmark tags but we'd have to // create a term table item for them. For now just make sure they stay as links. - $res['body'] = preg_replace('/\[bookmark(.*?)\](.*?)\[\/bookmark\]','[url$1]$2[/url]',$res['body']); + $res['body'] = preg_replace('/\[bookmark(.*?)\](.*?)\[\/bookmark\]/','[url$1]$2[/url]',$res['body']); } diff --git a/include/oembed.php b/include/oembed.php index de3a6edc8..8ce0fee96 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -56,6 +56,15 @@ function oembed_fetch_url($embedurl){ $txt = $x['body']; break; } + // soundcloud is now using text/json+oembed instead of application/json+oembed, + // others may be also + $entries = $xpath->query("//link[@type='text/json+oembed']"); + foreach($entries as $e){ + $href = $e->getAttributeNode("href")->nodeValue; + $x = z_fetch_url($href . '&maxwidth=' . $a->videowidth); + $txt = $x['body']; + break; + } } } } diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index d9777b1c4..508d82957 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -3,11 +3,24 @@ function photo_factory($data, $type = null) { $ph = null; - if(class_exists('Imagick')) { - require_once('include/photo/photo_imagick.php'); - $ph = new photo_imagick($data,$type); + $ignore_imagick = get_config('system', 'ignore_imagick'); + + if(class_exists('Imagick') && !$ignore_imagick) { + $v = Imagick::getVersion(); + preg_match('/ImageMagick ([0-9]+\.[0-9]+\.[0-9]+)/', $v['versionString'], $m); + if(version_compare($m[1],'6.6.7') >= 0) { + require_once('include/photo/photo_imagick.php'); + $ph = new photo_imagick($data,$type); + } + else { + // earlier imagick versions have issues with scaling png's + // don't log this because it will just fill the logfile. + // leave this note here so those who are looking for why + // we aren't using imagick can find it + } } - else { + + if(! $ph) { require_once('include/photo/photo_gd.php'); $ph = new photo_gd($data,$type); } @@ -480,11 +493,11 @@ abstract class photo_driver { * Guess image mimetype from filename or from Content-Type header * * @arg $filename string Image filename - * @arg $fromcurl boolean Check Content-Type header from curl request + * @arg $headers string Headers to check for Content-Type (from curl request) */ function guess_image_type($filename, $headers = '') { - logger('Photo: guess_image_type: '.$filename . ($fromcurl?' from curl headers':''), LOGGER_DEBUG); + logger('Photo: guess_image_type: '.$filename . ($headers?' from curl headers':''), LOGGER_DEBUG); $type = null; if ($headers) { $a = get_app(); @@ -494,21 +507,35 @@ function guess_image_type($filename, $headers = '') { list($k,$v) = array_map("trim", explode(":", trim($l), 2)); $hdrs[$k] = $v; } + logger('Curl headers: '.var_export($hdrs, true), LOGGER_DEBUG); if (array_key_exists('Content-Type', $hdrs)) $type = $hdrs['Content-Type']; } if (is_null($type)){ -// FIXME!!!! + + $ignore_imagick = get_config('system', 'ignore_imagick'); // Guessing from extension? Isn't that... dangerous? - if(class_exists('Imagick') && file_exists($filename) && is_readable($filename)) { - /** - * Well, this not much better, - * but at least it comes from the data inside the image, - * we won't be tricked by a manipulated extension - */ - $image = new Imagick($filename); - $type = $image->getImageMimeType(); - } else { + if(class_exists('Imagick') && file_exists($filename) && is_readable($filename) && !$ignore_imagick) { + $v = Imagick::getVersion(); + preg_match('/ImageMagick ([0-9]+\.[0-9]+\.[0-9]+)/', $v['versionString'], $m); + if(version_compare($m[1],'6.6.7') >= 0) { + /** + * Well, this not much better, + * but at least it comes from the data inside the image, + * we won't be tricked by a manipulated extension + */ + $image = new Imagick($filename); + $type = $image->getImageMimeType(); + } + else { + // earlier imagick versions have issues with scaling png's + // don't log this because it will just fill the logfile. + // leave this note here so those who are looking for why + // we aren't using imagick can find it + } + } + + if(is_null($type)) { $ext = pathinfo($filename, PATHINFO_EXTENSION); $ph = photo_factory(''); $types = $ph->supportedTypes(); @@ -552,7 +579,7 @@ function import_profile_photo($photo,$xchan,$thing = false) { if($photo) { $filename = basename($photo); - $type = guess_image_type($photo,true); + $type = guess_image_type($photo); if(! $type) $type = 'image/jpeg'; diff --git a/include/text.php b/include/text.php index 22cf17866..0e38de2d2 100644 --- a/include/text.php +++ b/include/text.php @@ -815,28 +815,26 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { function search($s,$id='search-box',$url='/search',$save = false) { $a = get_app(); - $o = '<div id="' . $id . '">'; - $o .= '<form action="' . $a->get_baseurl((stristr($url,'network')) ? true : false) . $url . '" method="get" >'; - $o .= '<input type="text" class="icon-search" name="search" id="search-text" placeholder="" value="' . $s .'" onclick="this.submit();" />'; - $o .= '<input class="search-submit btn btn-default" type="submit" name="submit" id="search-submit" value="' . t('Search') . '" />'; - if(feature_enabled(local_user(),'savedsearch')) - $o .= '<input class="search-save btn btn-default" type="submit" name="save" id="search-save" value="' . t('Save') . '" />'; - $o .= '</form></div>'; - return $o; + return replace_macros(get_markup_template('searchbox.tpl'),array( + '$s' => $s, + '$id' => $id, + '$action_url' => $a->get_baseurl((stristr($url,'network')) ? true : false) . $url, + '$search_label' => t('Search'), + '$save_label' => t('Save'), + '$savedsearch' => feature_enabled(local_user(),'savedsearch') + )); } function searchbox($s,$id='search-box',$url='/search',$save = false) { - $a = get_app(); - $o = '<div id="' . $id . '">'; - $o .= '<form action="' . z_root() . '/' . $url . '" method="get" >'; - $o .= '<input type="hidden" name="f" value="" />'; - $o .= '<input type="text" class="icon-search" name="search" id="search-text" placeholder="" value="' . $s .'" onclick="this.submit();" />'; - $o .= '<input type="submit" name="submit" class="btn btn-default" id="search-submit" value="' . t('Search') . '" />'; - if(feature_enabled(local_user(),'savedsearch')) - $o .= '<input type="submit" name="searchsave" class="btn btn-default" id="search-save" value="' . t('Save') . '" />'; - $o .= '</form></div>'; - return $o; + return replace_macros(get_markup_template('searchbox.tpl'),array( + '$s' => $s, + '$id' => $id, + '$action_url' => z_root() . '/' . $url, + '$search_label' => t('Search'), + '$save_label' => t('Save'), + '$savedsearch' => feature_enabled(local_user(),'savedsearch') + )); } @@ -2061,4 +2059,4 @@ function extra_query_args() { } } return $s; -}
\ No newline at end of file +} diff --git a/include/widgets.php b/include/widgets.php index f1c9ceada..8905df59a 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -532,6 +532,8 @@ function widget_mailmenu($arr) { $a = get_app(); return replace_macros(get_markup_template('message_side.tpl'), array( + '$title' => t('Messages'), + '$tabs'=> array(), '$check'=>array( diff --git a/mod/siteinfo.php b/mod/siteinfo.php index de55c69cf..c1d65fadd 100644 --- a/mod/siteinfo.php +++ b/mod/siteinfo.php @@ -55,6 +55,7 @@ function siteinfo_init(&$a) { $channels_active_halfyear_stat = intval(get_config('system','channels_active_halfyear_stat')); $channels_active_monthly_stat = intval(get_config('system','channels_active_monthly_stat')); $local_posts_stat = intval(get_config('system','local_posts_stat')); + $hide_in_statistics = intval(get_config('system','hide_in_statistics')); $data = Array( 'version' => RED_VERSION, @@ -74,7 +75,8 @@ function siteinfo_init(&$a) { 'channels_total' => $channels_total_stat, 'channels_active_halfyear' => $channels_active_halfyear_stat, 'channels_active_monthly' => $channels_active_monthly_stat, - 'local_posts' => $local_posts_stat + 'local_posts' => $local_posts_stat, + 'hide_in_statistics' => $hide_in_statistics ); json_return_and_die($data); } diff --git a/version.inc b/version.inc index a5c162410..147cef258 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-10-06.820 +2014-10-08.822 diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 21d6781f5..849ea3906 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -1,5 +1,11 @@ /* override some bootstrap settings */ +/* this might be a bug in bootstrap */ +.input-group-addon, +.input-group-btn { + width: unset; +} + /* nav overrides */ nav .badge { diff --git a/view/css/conversation.css b/view/css/conversation.css index 9cde6052f..03df5d4f3 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -94,7 +94,7 @@ } a.wall-item-name-link { - font-weight: bold; + font-weight: bold !important; } .wall-item-author { diff --git a/view/css/mod_message.css b/view/css/mod_message.css index 4290025a5..011c3edd5 100644 --- a/view/css/mod_message.css +++ b/view/css/mod_message.css @@ -1,13 +1,3 @@ -/* message side */ - -#message-check { - text-align: left; - white-space: normal; - margin-top: 48px; - margin-bottom: 15px; -} - - /* message */ #mail-list-wrapper { diff --git a/view/css/widgets.css b/view/css/widgets.css index 862d72af2..b5dc7e6f8 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -1,9 +1,6 @@ - -/* Easiest way to indent the widget body - indent the entire widget and then shift the header label back to the left */ - .widget { margin-bottom: 10px; - padding: 10px 10px 10px 20px; + padding: 10px; } .widget h3 { @@ -34,45 +31,12 @@ height: 150px; } -#note-save { - margin-top: 10px; -} - /* saved searches */ - -#netsearch-box #search-submit { - margin: 10px 0 7px 0; -} - -#netsearch-box #search-save { - margin: 9px 0 7px 6px; -} -.search-save { - margin: 7px 0 7px 7px; -} - -.saved-search-li { - margin-top: 3px; -} - -.saved-search-li i { - opacity: 0; +#saved-search-list { + margin-top: 2px; } -.saved-search-li:hover i { - opacity: 1; -} - -.saved-search-icon { - float: right; -} - -.savedsearchterm { - display: block; - width: 150px; - overflow: hidden; -} /* peoplefind */ @@ -95,13 +59,7 @@ /* posted date */ .posted-date-selector-months { - margin-left: 10px; -} - -#datebrowse-sidebar select { - width: 190px; - max-width: 190px; - max-height: 150px; + margin: 2px 0px 0px 10px; } /* categories */ @@ -109,18 +67,6 @@ /* group */ -#sidebar-group-list { - margin-bottom: 10px; -} - -.sidebar-group-li input { - float: right; -} - -.groupsideedit { - float: right; -} - .group-edit-icon { opacity: 0; z-index: 1; @@ -144,9 +90,6 @@ li:hover .group-edit-icon { /* photo albums */ -#photo-albums-upload-link { - margin-top: 10px; -} /* Chatrooms */ diff --git a/view/php/theme_init.php b/view/php/theme_init.php index ce576805a..f1eaded6a 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -33,7 +33,7 @@ head_add_js('library/cryptojs/components/core-min.js'); head_add_js('library/cryptojs/rollups/aes.js'); head_add_js('library/cryptojs/rollups/rabbit.js'); head_add_js('library/cryptojs/rollups/tripledes.js'); -head_add_js('library/stylish_select/jquery.stylish-select.js'); +//head_add_js('library/stylish_select/jquery.stylish-select.js'); head_add_js('acl.js'); head_add_js('webtoolkit.base64.js'); head_add_js('main.js'); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 29c034ac8..1d5fcaa1a 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -62,6 +62,7 @@ abbr { } a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { + font-weight: $link_font_weight; color: $link_colour; text-decoration: none; } @@ -271,21 +272,6 @@ footer { margin-bottom: 15px; } -aside ul { - list-style-type: none; - margin: 0; - padding: 0; - /* border-left: 1px solid #eee; This and a 5px left border on the li is "interesting" - to delineate the list from the surrounding bits - */ -} - -aside li { - margin-top: 5px; - /* in order to achieve consistent indentation cross-browser, set margin-left on the li element e.g. */ - /* margin-left: 10px; */ -} - /*TODO: we should use one class for all this. */ .group-selected, .fileas-selected, .categories-selected, .search-selected, .active { color: $selected_active_colour !important; @@ -872,14 +858,6 @@ aside li { margin-bottom: 25px; } -#search-submit { - margin-left: 15px; -} - -#search-box { - margin-bottom: 25px; -} - #nav-searchbar { float: right; margin-top: 2px; @@ -919,15 +897,14 @@ aside li { #search-text { border: 1px solid #ccc; font-size: 1em; + border-top-right-radius: 0px; + border-bottom-right-radius: 0px; } -#search-text::-webkit-input-placeholder { - font-family: FontAwesome; +#netsearch-box .btn-sm { + padding: 2.78px 10px; } -#search-text::-moz-placeholder { - font-family: FontAwesome; -} .profile-clear { clear: both; @@ -2310,6 +2287,15 @@ blockquote { $dropdown_bgimghover } +aside .nav > li > a:hover, aside .nav > li > a:focus { + text-decoration: $navtabs_decohover; + background-color: $navaside_bghover; +} + +aside .nav-pills > li > a { + padding: 6px 10px; +} + .dropdown-menu img { border-radius: $radiuspx; } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index edf77cb0b..01ca5a7b9 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -109,6 +109,10 @@ if(! $a->install) { $navtabs_bgchover = "rgba(238,238,238,0.8)"; if (! $link_colour) $link_colour = "#428BCA"; + if (! $navaside_bghover) + $navaside_bghover = "#eee"; + if (! $link_font_weight) + $link_font_weight = "normal"; if (! $banner_colour) $banner_colour = "#fff"; if (! $search_background) @@ -320,7 +324,9 @@ $options = array ( '$navtabs_linkchover' => $navtabs_linkchover, '$navtabs_bgchover' => $navtabs_bgchover, '$navtabs_decohover' => $navtabs_decohover, +'$navaside_bghover' => $navaside_bghover, '$link_colour' => $link_colour, +'$link_font_weight' => $link_font_weight, '$banner_colour' => $banner_colour, '$search_background' => $search_background, '$bgcolour' => $bgcolour, diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 27648f9fa..96600f9f6 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -34,8 +34,12 @@ $navtabs_bgchover = "#222"; if (! $navtabs_decohover) $navtabs_decohover = "underline"; + if (! $navaside_bghover) + $navaside_bghover = "#222"; if (! $link_colour) $link_colour = "#fff"; + if (! $link_font_weight) + $link_font_weight = "bold"; if (! $selected_active_colour) $selected_active_colour = "#fff"; if (! $selected_active_deco) diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php index cdd85a129..42a62c5ba 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.php +++ b/view/theme/redbasic/schema/simple_black_on_white.php @@ -34,8 +34,12 @@ $navtabs_bgchover = "#fff"; if (! $navtabs_decohover) $navtabs_decohover = "underline"; +if (! $navaside_bghover) + $navaside_bghover = "#F5F5F5"; if (! $link_colour) $link_colour = "#000"; + if (! $link_font_weight) + $link_font_weight = "bold"; if (! $selected_active_colour) $selected_active_colour = "#000"; if (! $selected_active_deco) diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php index 3a1ea9134..641a46668 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.php +++ b/view/theme/redbasic/schema/simple_green_on_black.php @@ -34,8 +34,12 @@ $navtabs_bgchover = "#000"; if (! $navtabs_decohover) $navtabs_decohover = "underline"; +if (! $navaside_bghover) + $navaside_bghover = "#143D12"; if (! $link_colour) $link_colour = "#50f148"; + if (! $link_font_weight) + $link_font_weight = "bold"; if (! $selected_active_colour) $selected_active_colour = "#50f148"; if (! $selected_active_deco) diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php index 74d133038..50379dfe4 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.php +++ b/view/theme/redbasic/schema/simple_white_on_black.php @@ -34,8 +34,12 @@ $navtabs_bgchover = "#000"; if (! $navtabs_decohover) $navtabs_decohover = "underline"; + if (! $navaside_bghover) + $navaside_bghover = "#030303"; if (! $link_colour) $link_colour = "#fff"; + if (! $link_font_weight) + $link_font_weight = "bold"; if (! $selected_active_colour) $selected_active_colour = "#fff"; if (! $selected_active_deco) diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl index cb3827bf2..b1838ece1 100755 --- a/view/tpl/admin_aside.tpl +++ b/view/tpl/admin_aside.tpl @@ -10,35 +10,35 @@ }); }); </script> -<h4><a href="{{$admurl}}">{{$admtxt}}</a></h4> -<ul class='admin linklist'> - <li class='admin link button {{$admin.site.2}}'><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li> - <li class='admin link button {{$admin.users.2}}'><a href='{{$admin.users.0}}'>{{$admin.users.1}}</a><span id='pending-update' title='{{$h_pending}}'></span></li> - <li class='admin link button {{$admin.channels.2}}'><a href='{{$admin.channels.0}}'>{{$admin.channels.1}}</a></li> - <li class='admin link button {{$admin.plugins.2}}'><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li> - <li class='admin link button {{$admin.themes.2}}'><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li> - <li class='admin link button {{$admin.hubloc.2}}'><a href='{{$admin.hubloc.0}}'>{{$admin.hubloc.1}}</a></li> - <li class='admin link button {{$admin.dbsync.2}}'><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li> +<h3>{{$admtxt}}</h3> +<ul class="nav nav-pills nav-stacked"> + <li><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li> + <li><a href='{{$admin.users.0}}'>{{$admin.users.1}}<span id='pending-update' title='{{$h_pending}}'></span></a></li> + <li><a href='{{$admin.channels.0}}'>{{$admin.channels.1}}</a></li> + <li><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li> + <li><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li> + <li><a href='{{$admin.hubloc.0}}'>{{$admin.hubloc.1}}</a></li> + <li><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li> </ul> {{if $admin.update}} -<ul class='admin linklist'> - <li class='admin link button {{$admin.update.2}}'><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li> - <li class='admin link button {{$admin.update.2}}'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li> +<ul class="nav nav-pills nav-stacked"> + <li><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li> + <li><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li> </ul> {{/if}} -{{if $admin.plugins_admin}}<h4>{{$plugadmtxt}}</h4>{{/if}} -<ul class='admin linklist'> +{{if $admin.plugins_admin}}<h3>{{$plugadmtxt}}</h3>{{/if}} +<ul class="nav nav-pills nav-stacked"> {{foreach $admin.plugins_admin as $l}} - <li class='admin link button {{$l.2}}'><a href='{{$l.0}}'>{{$l.1}}</a></li> + <li><a href='{{$l.0}}'>{{$l.1}}</a></li> {{/foreach}} </ul> -<h4>{{$logtxt}}</h4> -<ul class='admin linklist'> - <li class='admin link button {{$admin.logs.2}}'><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li> +<h3>{{$logtxt}}</h3> +<ul class="nav nav-pills nav-stacked"> + <li><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li> </ul> diff --git a/view/tpl/app_select.tpl b/view/tpl/app_select.tpl index 5cf3f40d6..527d01eae 100644 --- a/view/tpl/app_select.tpl +++ b/view/tpl/app_select.tpl @@ -1,7 +1,7 @@ {{if $authed}} <div class="widget"> <h3>{{$title}}</h3> -<ul> +<ul class="nav nav-pills nav-stacked"> <li><a href="appman">{{$new}}</a></li> <li><a href="apps/edit">{{$edit}}</a></li> </ul> diff --git a/view/tpl/categories_widget.tpl b/view/tpl/categories_widget.tpl index 2c0b3bcc2..ea6d28dfc 100755 --- a/view/tpl/categories_widget.tpl +++ b/view/tpl/categories_widget.tpl @@ -2,10 +2,10 @@ <h3>{{$title}}</h3> <div id="categories-sidebar-desc">{{$desc}}</div> - <ul class="categories-ul"> - <li class="tool"><a href="{{$base}}" class="categories-link categories-all{{if $sel_all}} categories-selected{{/if}}">{{$all}}</a></li> + <ul class="nav nav-pills nav-stacked"> + <li><a href="{{$base}}"{{if $sel_all}} class="categories-selected"{{/if}}>{{$all}}</a></li> {{foreach $terms as $term}} - <li class="tool"><a href="{{$base}}?f=&cat={{$term.name}}" class="categories-link{{if $term.selected}} categories-selected{{/if}}">{{$term.name}}</a></li> + <li><a href="{{$base}}?f=&cat={{$term.name}}"{{if $term.selected}} class="categories-selected"{{/if}}>{{$term.name}}</a></li> {{/foreach}} </ul> diff --git a/view/tpl/fileas_widget.tpl b/view/tpl/fileas_widget.tpl index 70d68c56e..a92440cb0 100755 --- a/view/tpl/fileas_widget.tpl +++ b/view/tpl/fileas_widget.tpl @@ -2,10 +2,10 @@ <h3>{{$title}}</h3> <div id="nets-desc">{{$desc}}</div> - <ul class="fileas-ul"> - <li class="tool"><a href="{{$base}}" class="fileas-link fileas-all{{if $sel_all}} fileas-selected{{/if}}">{{$all}}</a></li> + <ul class="nav nav-pills nav-stacked"> + <li><a href="{{$base}}"{{if $sel_all}} class="fileas-selected"{{/if}}>{{$all}}</a></li> {{foreach $terms as $term}} - <li class="tool"><a href="{{$base}}?f=&file={{$term.name}}" class="fileas-link{{if $term.selected}} fileas-selected{{/if}}">{{$term.name}}</a></li> + <li><a href="{{$base}}?f=&file={{$term.name}}"{{if $term.selected}} class="fileas-selected"{{/if}}>{{$term.name}}</a></li> {{/foreach}} </ul> diff --git a/view/tpl/generic_links_widget.tpl b/view/tpl/generic_links_widget.tpl index 5ae52aa8a..d7c234a84 100755 --- a/view/tpl/generic_links_widget.tpl +++ b/view/tpl/generic_links_widget.tpl @@ -2,9 +2,9 @@ {{if $title}}<h3>{{$title}}</h3>{{/if}} {{if $desc}}<div class="desc">{{$desc}}</div>{{/if}} - <ul> + <ul class="nav nav-pills nav-stacked"> {{foreach $items as $item}} - <li class="tool"><a href="{{$item.url}}" class="{{if $item.selected}}active{{/if}}">{{$item.label}}</a></li> + <li><a href="{{$item.url}}" class="{{if $item.selected}}active{{/if}}">{{$item.label}}</a></li> {{/foreach}} </ul> diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl index 9037e0871..3701f979e 100755 --- a/view/tpl/group_side.tpl +++ b/view/tpl/group_side.tpl @@ -14,7 +14,7 @@ {{if $group.edit}} <a class="pull-right group-edit-icon" href="{{$group.edit.href}}" title="{{$edittext}}"><i class="icon-pencil"></i></a> {{/if}} - <a class="{{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a> + <a{{if $group.selected}} class="group-selected"{{/if}} href="{{$group.href}}">{{$group.text}}</a> </li> {{/foreach}} <li> diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl index 723a64019..3e32eae14 100755 --- a/view/tpl/message_side.tpl +++ b/view/tpl/message_side.tpl @@ -1,11 +1,14 @@ -<div id="message-sidebar" class="widget"> - <div id="message-check" class="btn btn-default"><a href="{{$check.url}}" class="{{if $check.sel}}checkmessage-selected{{/if}}">{{$check.label}}</a> </div> - <div id="message-new" class="btn btn-default"><a href="{{$new.url}}" class="{{if $new.sel}}newmessage-selected{{/if}}">{{$new.label}}</a> </div> - - <ul class="message-ul"> +<div class="widget"> + <h3>{{$title}}</h3> + <ul class="nav nav-pills nav-stacked"> + <li><a href="{{$check.url}}"{{if $check.sel}} class="checkmessage-selected"{{/if}}>{{$check.label}}</a></li> + <li><a href="{{$new.url}}"{{if $new.sel}} class="newmessage-selected"{{/if}}>{{$new.label}}</a></li> + </ul> + {{if $tabs}} + <ul class="nav nav-pills nav-stacked"> {{foreach $tabs as $t}} - <li class="tool"><a href="{{$t.url}}" class="message-link{{if $t.sel}}message-selected{{/if}}">{{$t.label}}</a></li> + <li><a href="{{$t.url}}"{{if $t.sel}} class="message-selected"{{/if}}>{{$t.label}}</a></li> {{/foreach}} </ul> - + {{/if}} </div> diff --git a/view/tpl/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl index 0867ab392..1104d61bb 100755 --- a/view/tpl/posted_date_widget.tpl +++ b/view/tpl/posted_date_widget.tpl @@ -1,16 +1,20 @@ <div id="datebrowse-sidebar" class="widget"> <h3>{{$title}}</h3> -<script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script> -<ul id="posted-date-selector"> -{{foreach $dates as $y => $arr}} -<li id="posted-date-selector-year-{{$y}}" class="fakelink" onclick="openClose('posted-date-selector-{{$y}}');">{{$y}}</li> -<div id="posted-date-selector-{{$y}}" style="display: none;"> -<ul class="posted-date-selector-months"> -{{foreach $arr as $d}} -<li class="posted-date-li"><a href="#" onclick="dateSubmit('{{$url}}?f=&dend={{$d.1}}&dbegin={{$d.2}}'); return false;">{{$d.0}}</a></li> -{{/foreach}} -</ul> -</div> -{{/foreach}} -</ul> + <script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script> + <ul id="posted-date-selector" class="nav nav-pills nav-stacked"> + {{foreach $dates as $y => $arr}} + <li id="posted-date-selector-year-{{$y}}"> + <a href="#" onclick="openClose('posted-date-selector-{{$y}}'); return false;">{{$y}}</a> + </li> + <div id="posted-date-selector-{{$y}}" style="display: none;"> + <ul class="posted-date-selector-months nav nav-pills nav-stacked"> + {{foreach $arr as $d}} + <li> + <a href="#" onclick="dateSubmit('{{$url}}?f=&dend={{$d.1}}&dbegin={{$d.2}}'); return false;">{{$d.0}}</a> + </li> + {{/foreach}} + </ul> + </div> + {{/foreach}} + </ul> </div> diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl index 1a9f51af9..ee797ea9d 100644 --- a/view/tpl/saved_searches.tpl +++ b/view/tpl/saved_searches.tpl @@ -1,12 +1,12 @@ -<div class="widget" id="saved-search-list"> +<div class="widget"> <h3 id="search">{{$title}}</h3> {{$searchbox}} - <ul id="saved-search-ul"> + <ul id="saved-search-list" class="nav nav-pills nav-stacked"> {{foreach $saved as $search}} - <li id="search-term-{{$search.id}}" class="saved-search-li clear"> - <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer saved-search-icon" ></i></a> - <a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="{{$search.srchlink}}">{{$search.displayterm}}</a> + <li id="search-term-{{$search.id}}"> + <a class="pull-right group-edit-icon" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove" ></i></a> + <a id="saved-search-term-{{$search.id}}"{{if $search.selected}} class="search-selected"{{/if}} href="{{$search.srchlink}}">{{$search.displayterm}}</a> </li> {{/foreach}} </ul> diff --git a/view/tpl/saved_searches_aside.tpl b/view/tpl/saved_searches_aside.tpl index 0258a7632..e0983f0dd 100755 --- a/view/tpl/saved_searches_aside.tpl +++ b/view/tpl/saved_searches_aside.tpl @@ -2,10 +2,10 @@ <h3 id="search">{{$title}}</h3> {{$searchbox}} - <ul id="saved-search-ul"> + <ul id="saved-search-ul" class="nav nav-pills nav-stacked" > {{foreach $saved as $search}} <li id="search-term-{{$search.id}}" class="saved-search-li clear"> - <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="network/?f=&remove=1&search={{$search.encodedterm}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop saved-search-icon" ></i></a> + <a title="{{$search.delete}}" class="pull-right" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="network/?f=&remove=1&search={{$search.encodedterm}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop saved-search-icon" ></i></a> <a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="network/?f=&search={{$search.encodedterm}}">{{$search.displayterm}}</a> </li> {{/foreach}} diff --git a/view/tpl/searchbox.tpl b/view/tpl/searchbox.tpl new file mode 100644 index 000000000..02b2d4a50 --- /dev/null +++ b/view/tpl/searchbox.tpl @@ -0,0 +1,12 @@ +<form action="{{$action_url}}" method="get" > + <input type="hidden" name="f" value="" /> + <div id="{{$id}}" class="input-group"> + <input type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" /> + <div class="input-group-btn"> + <button type="submit" name="submit" class="btn btn-default btn-sm" id="search-submit" value="{{$search_label}}"><i class="icon-search"></i></button> + {{if $savedsearch}} + <button type="submit" name="searchsave" class="btn btn-default btn-sm" id="search-save" value="{{$save_label}}"><i class="icon-save"></i></button> + {{/if}} + </div> + </div> +</form> |