Browse Source

Merge branch 'pull'

pull/172/merge
friendica 10 years ago
parent
commit
be52ec6f5a
  1. 2
      mod/item.php
  2. 16
      view/theme/dispy-dark/nav.tpl
  3. 11
      view/theme/dispy-dark/style.css
  4. 2
      view/theme/dispy-dark/theme.php
  5. 16
      view/theme/dispy/nav.tpl
  6. 9
      view/theme/dispy/style.css
  7. 4
      view/theme/dispy/theme.php

2
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",

16
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>

11
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;

2
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);
}

16
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>

9
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;

4
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);
}

Loading…
Cancel
Save