diff options
| -rwxr-xr-x | mod/item.php | 2 | ||||
| -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 | 2 | ||||
| -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 |
7 files changed, 45 insertions, 15 deletions
diff --git a/mod/item.php b/mod/item.php index fc1c5fd0f..5baae2bde 100755 --- a/mod/item.php +++ b/mod/item.php @@ -624,7 +624,7 @@ function item_post(&$a) { dbesc($datarray['attach']), intval($datarray['bookmark']), intval($datarray['origin']), - intval($datarry['moderated']) + intval($datarray['moderated']) ); $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1", 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 9b6ea76bf..4c938997b 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -151,6 +151,6 @@ function dispydark_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); } |