diff options
| -rwxr-xr-x | boot.php | 2 | ||||
| -rw-r--r-- | images/blank.png | bin | 0 -> 1366 bytes | |||
| -rwxr-xr-x | include/plugin.php | 10 | ||||
| -rwxr-xr-x | mod/admin.php | 8 | ||||
| -rwxr-xr-x | view/admin_plugins_details.tpl | 4 | ||||
| -rw-r--r-- | view/theme/comix-plain/screenshot.jpg | bin | 0 -> 323812 bytes | |||
| -rw-r--r-- | view/theme/dispy-dark/nav.tpl | 16 | ||||
| -rw-r--r-- | view/theme/dispy-dark/style.css | 11 | ||||
| -rw-r--r-- | view/theme/dispy-dark/theme.php | 4 | ||||
| -rw-r--r-- | view/theme/dispy/nav.tpl | 16 | ||||
| -rw-r--r-- | view/theme/dispy/style.css | 9 | ||||
| -rw-r--r-- | view/theme/dispy/theme.php | 4 |
12 files changed, 67 insertions, 17 deletions
@@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1291' ); +define ( 'FRIENDICA_VERSION', '2.3.1292' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1133 ); diff --git a/images/blank.png b/images/blank.png Binary files differnew file mode 100644 index 000000000..67d391966 --- /dev/null +++ b/images/blank.png diff --git a/include/plugin.php b/include/plugin.php index 8280b1022..df33fd3f2 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -276,3 +276,13 @@ function get_theme_info($theme){ return $info; }} + +function get_theme_screenshot($theme) { + $a = get_app(); + $exts = array('.png','.jpg'); + foreach($exts as $ext) { + if(file_exists('view/theme/' . $theme . '/screenshot' . $ext)) + return($a->get_baseurl() . '/view/theme/' . $theme . '/screenshot' . $ext); + } + return($a->get_baseurl() . '/images/blank.png'); +} diff --git a/mod/admin.php b/mod/admin.php index a64b26903..53b5ee354 100755 --- a/mod/admin.php +++ b/mod/admin.php @@ -583,6 +583,7 @@ function admin_page_plugins(&$a){ '$admin_form' => $admin_form, '$function' => 'plugins', + '$screenshot' => '', '$readme' => $readme )); } @@ -738,7 +739,11 @@ function admin_page_themes(&$a){ } $admin_form=""; - + + $screenshot = array( get_theme_screenshot($theme), t('Screenshot')); + if(! stristr($screenshot[0],$theme)) + $screenshot = null; + $t = get_markup_template("admin_plugins_details.tpl"); return replace_macros($t, array( '$title' => t('Administration'), @@ -755,6 +760,7 @@ function admin_page_themes(&$a){ '$admin_form' => $admin_form, '$str_author' => t('Author: '), '$str_maintainer' => t('Maintainer: '), + '$screenshot' => $screenshot, '$readme' => $readme )); } diff --git a/view/admin_plugins_details.tpl b/view/admin_plugins_details.tpl index ead356f5b..cbaef2d66 100755 --- a/view/admin_plugins_details.tpl +++ b/view/admin_plugins_details.tpl @@ -16,6 +16,10 @@ {{ endfor }} </p> + {{ if $screenshot }} + <a href="$screenshot.0" ><img src="$screenshot.0" width="320" height="240" alt="$screenshot.1" /></a> + {{ endif }} + {{ if $admin_form }} <h3>$settings</h3> <form method="post" action="$baseurl/admin/$function/$plugin/"> diff --git a/view/theme/comix-plain/screenshot.jpg b/view/theme/comix-plain/screenshot.jpg Binary files differnew file mode 100644 index 000000000..80e66e312 --- /dev/null +++ b/view/theme/comix-plain/screenshot.jpg diff --git a/view/theme/dispy-dark/nav.tpl b/view/theme/dispy-dark/nav.tpl index 11469dc66..589d68352 100644 --- a/view/theme/dispy-dark/nav.tpl +++ b/view/theme/dispy-dark/nav.tpl @@ -5,7 +5,7 @@ <!-- yes, they're going the other way. seems that's how the template renderer works --> - <div id="nav-floater"> +<div id="nav-floater"> <div id="nav-buttons"> {{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a> @@ -33,17 +33,23 @@ works --> {{ endif }} {{ if $nav.network }} <a id="nav-network-link" class="nav-link $nav.network.2" - href="$nav.network.0" title="$nav.network.1">$nav.network.1</a> + href="$nav.network.0" title="$nav.network.1">$nav.network.1</a> {{ endif }} {{ if $nav.home }} <a id="nav-home-link" class="nav-link $nav.home.2" - href="$nav.home.0" title="$nav.home.1">$nav.home.1</a> + href="$nav.home.0" title="$nav.home.1">$nav.home.1</a> {{ endif }} {{ if $nav.login }} <a id="nav-login-link" class="nav-login-link $nav.login.2" - href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> + href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }} - </div> + </div> + + <div class="search-box"> + <form method="get" action="$nav.search.0"> + <input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" /> + </form> + </div> <div id="user-menu"> <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a> diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index ba8cda3c6..6292da6d2 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -221,7 +221,7 @@ input[type=submit] { * nav */ nav { - height: 60px; + height: 80px; display: block; background-color: #1d1f1d; color: #eeeeec; @@ -490,6 +490,15 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link margin: 0px; background: transparent url(icons.png) -190px -60px no-repeat; } +.search-box { + margin: 5px; + width: 65%; + height: 40px; + z-index: 100; +} +#search-text { + border: 1px #2e2f2e solid; +} .nav-ajax-update, .nav-ajax-left { width: 30px; height: 19px; diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index cded68c48..4c938997b 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -127,7 +127,7 @@ $(document).ready(function() { </script> EOT; -function dispy_community_info() { +function dispydark_community_info() { $a = get_app(); $fostitJS = "javascript: (function() { @@ -151,6 +151,6 @@ function dispy_community_info() { $aside['$url'] = $url; $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); - $a->page['right_aside'] = replace_macros($tpl, $aside); + $a->page['aside'] = replace_macros($tpl, $aside); } diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl index 11469dc66..589d68352 100644 --- a/view/theme/dispy/nav.tpl +++ b/view/theme/dispy/nav.tpl @@ -5,7 +5,7 @@ <!-- yes, they're going the other way. seems that's how the template renderer works --> - <div id="nav-floater"> +<div id="nav-floater"> <div id="nav-buttons"> {{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a> @@ -33,17 +33,23 @@ works --> {{ endif }} {{ if $nav.network }} <a id="nav-network-link" class="nav-link $nav.network.2" - href="$nav.network.0" title="$nav.network.1">$nav.network.1</a> + href="$nav.network.0" title="$nav.network.1">$nav.network.1</a> {{ endif }} {{ if $nav.home }} <a id="nav-home-link" class="nav-link $nav.home.2" - href="$nav.home.0" title="$nav.home.1">$nav.home.1</a> + href="$nav.home.0" title="$nav.home.1">$nav.home.1</a> {{ endif }} {{ if $nav.login }} <a id="nav-login-link" class="nav-login-link $nav.login.2" - href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> + href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }} - </div> + </div> + + <div class="search-box"> + <form method="get" action="$nav.search.0"> + <input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" /> + </form> + </div> <div id="user-menu"> <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a> diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 935ca507e..116f88b31 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -482,6 +482,15 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link margin: 0px; background: transparent url(icons.png) -190px -60px no-repeat; } +.search-box { + margin: 5px; + width: 65%; + height: 40px; + z-index: 100; +} +#search-text { + border: 1px #eec solid; +} .nav-ajax-update, .nav-ajax-left { width: 30px; height: 19px; diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index e898346ef..9db77d7f3 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -131,7 +131,7 @@ function dispy_community_info() { $a = get_app(); $fostitJS = "javascript: (function() { - the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' + + the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text)); @@ -151,6 +151,6 @@ function dispy_community_info() { $aside['$url'] = $url; $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); - $a->page['right_aside'] = replace_macros($tpl, $aside); + $a->page['aside'] = replace_macros($tpl, $aside); } |
