diff options
| -rw-r--r-- | mod/register.php | 2 | ||||
| -rw-r--r-- | view/theme/fancyred/tpl/nav.tpl | 111 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 38 | ||||
| -rw-r--r-- | view/tpl/nav.tpl | 6 |
4 files changed, 31 insertions, 126 deletions
diff --git a/mod/register.php b/mod/register.php index dbf8d25b7..88fe69039 100644 --- a/mod/register.php +++ b/mod/register.php @@ -42,7 +42,7 @@ function register_post(&$a) { return; } - $policy = get_config('system','register_policy'); + $policy = get_config('config','register_policy'); switch($policy) { diff --git a/view/theme/fancyred/tpl/nav.tpl b/view/theme/fancyred/tpl/nav.tpl deleted file mode 100644 index 79467cd7d..000000000 --- a/view/theme/fancyred/tpl/nav.tpl +++ /dev/null @@ -1,111 +0,0 @@ -<header> - <div id="site-location">$sitelocation</div> - <div id="banner">$banner</div> -</header> -<nav> - <ul> - {{ if $nav.lock }} - <li id="nav-rmagic-link" class="nav-menu-icon" > - <a class="icon $nav.lock.2" href="$nav.lock.0" title="$nav.lock.3" >$nav.lock.1</a> - </li> - {{ endif }} - - - {{ if $nav.network }} - <li id="nav-network-link" class="nav-menu $sel.network"> - <a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" ><span class="icon network">$nav.network.1</span></a> - <span id="net-update" class="nav-notify"></span> - </li> - {{ endif }} - {{ if $nav.home }} - <li id="nav-home-link" class="nav-menu $sel.home"> - <a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" ><span class="icon home">$nav.home.1</span></a> - <span id="home-update" class="nav-notify"></span> - </li> - {{ endif }} - - {{ if $nav.intros }} - <li id="nav-intros-link" class="nav-menu $sel.intros"> - <a class="$nav.intros.2" href="$nav.intros.0" title="$nav.intros.3" ><span class="icon introductions">$nav.intros.1</a> - <span id="intro-update" class="nav-notify"></span> - </li> - {{ endif }} - - - {{ if $nav.notifications }} - - <li id="nav-notifications-linkmenu" class="nav-menu fakelink" onclick="notify_popup(); return false;" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a> - <span id="notify-update" class="nav-notify"></span> - <ul id="nav-notifications-menu" class="menu-popup"> - <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li> - <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li> - <li class="empty">$emptynotifications</li> - </ul> - </li> - {{ endif }} - - <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a> - <ul id="nav-site-menu" class="menu-popup"> - {{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }} - {{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }} - {{ if $nav.profiles }}<li><a class="$nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3">$nav.profiles.1</a></li>{{ endif }} - - {{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }} - - {{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }} - {{ if $nav.login }}<li><a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }} - </ul> - </li> - - {{ if $userinfo }} - <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$userinfo.name"><img src="$userinfo.icon" alt="$userinfo.name"></a> - {{ if $localuser }} - <ul id="nav-user-menu" class="menu-popup"> - {{ for $nav.usermenu as $usermenu }} - <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li> - {{ endfor }} - - {{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }} - {{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }} - {{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }} - </ul> - {{ endif }} - </li> - {{ endif }} - - {{ if $nav.help }} - <li id="nav-help-link" class="nav-menu $sel.help"> - <a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a> - </li> - {{ endif }} - - {{ if $nav.apps }} - <li id="nav-apps-link" class="nav-menu $sel.apps"> - <a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a> - <ul id="nav-apps-menu" class="menu-popup"> - {{ for $apps as $ap }} - <li>$ap</li> - {{ endfor }} - </ul> - </li> - {{ endif }} - - <li id="nav-searchbar"> - <form method="get" action="search"> - <input id="nav-search-text" type="text" value="" placeholder="$nav.search.1" name="search" title="$nav.search.3" onclick="this.submit();" /> - </form> - </li> - - - - - </ul> - - -</nav> -<ul id="nav-notifications-template" style="display:none;" rel="template"> - <li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li> -</ul> - -<div style="position: fixed; top: 3px; left: 5px; z-index:9999">$langselector</div> -<div id="panel" style="display: none;"></div> diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 3d4e374f5..de51da983 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -51,7 +51,31 @@ color: #d00; padding: 1px; } .icon.gear { - background-image: url("../../../../images/icons/22/gear.png"); + background-image: url("../img/settings.png"); + min-width: 22px; + height: 22px; + background-position: left center; + padding: 1px; +} + +.icon.home { + background-image: url("../img/home.png"); + min-width: 22px; + height: 22px; + background-position: left center; + padding: 1px; +} + +.icon.network { + background-image: url("../img/network.png"); + min-width: 22px; + height: 22px; + background-position: left center; + padding: 1px; +} + +.icon.introductions { + background-image: url("../img/introductions.png"); min-width: 22px; height: 22px; background-position: left center; @@ -1206,10 +1230,7 @@ input#dfrn-url { } .wall-item-delete-wrapper { - /* TODO - This should really go somewhere at the right, but for now, that leaves - it dangling at the edge of whitespace, so we'll put it with the other wall item tools for the time being */ - float: left; + float: right; } .wall-item-delete-end { @@ -1236,7 +1257,6 @@ input#dfrn-url { height: 50px !important; } .wall-item-content { - float: left; margin-left: 10px; overflow: auto; } @@ -1274,13 +1294,9 @@ width: 90%; .wall-item-tools { clear: both; /* background-image: url("../img/head.jpg"); */ -/* background-position: 0 -20px; - background-repeat: repeat-x; background: #eee; padding: 5px 10px; - border-radius: 0px 0px 20px 20px; - border: 1px #eec solid; */ -} +} .wall-item-like { margin: 15px; diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index d052cde3f..654a61085 100644 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -13,13 +13,13 @@ {{ if $nav.network }} <li id="nav-network-link" class="nav-menu $sel.network"> - <a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a> + <a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" ><span class="icon network">$nav.network.1</span></a> <span id="net-update" class="nav-notify fakelink" onclick="notify_popup('network'); return false;" ></span> </li> {{ endif }} {{ if $nav.home }} <li id="nav-home-link" class="nav-menu $sel.home"> - <a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a> + <a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" ><span class="icon home">$nav.home.1</span></a> <span id="home-update" class="nav-notify fakelink" onclick="notify_popup('home'); return false;" ></span> </li> {{ endif }} @@ -33,7 +33,7 @@ {{ if $nav.intros }} <li id="nav-intros-link" class="nav-menu $sel.intros"> - <a class="$nav.intros.2" href="$nav.intros.0" title="$nav.intros.3" >$nav.intros.1</a> + <a class="$nav.intros.2" href="$nav.intros.0" title="$nav.intros.3" ><span class="icon introductions">$nav.intros.1</span></a> <span id="intro-update" class="nav-notify"></span> </li> {{ endif }} |