aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
Diffstat (limited to 'view/theme')
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-aerith/group_side.tpl5
-rw-r--r--view/theme/diabook-aerith/nav.tpl18
-rw-r--r--view/theme/diabook-aerith/nets.tpl4
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-blue/group_side.tpl5
-rw-r--r--view/theme/diabook-blue/nav.tpl12
-rw-r--r--view/theme/diabook-blue/nets.tpl4
-rwxr-xr-x[-rw-r--r--]view/theme/diabook-red/group_side.tpl5
-rw-r--r--view/theme/diabook-red/nav.tpl16
-rw-r--r--view/theme/diabook-red/nets.tpl4
-rwxr-xr-xview/theme/diabook/group_side.tpl5
-rw-r--r--view/theme/diabook/nav.tpl2
-rw-r--r--view/theme/diabook/nets.tpl4
12 files changed, 59 insertions, 25 deletions
diff --git a/view/theme/diabook-aerith/group_side.tpl b/view/theme/diabook-aerith/group_side.tpl
index 642019049..8600402f2 100644..100755
--- a/view/theme/diabook-aerith/group_side.tpl
+++ b/view/theme/diabook-aerith/group_side.tpl
@@ -25,5 +25,10 @@
{{ endfor }}
</ul>
</div>
+ {{ if $ungrouped }}
+ <div id="sidebar-ungrouped">
+ <a href="nogroup">$ungrouped</a>
+ </div>
+ {{ endif }}
</div>
diff --git a/view/theme/diabook-aerith/nav.tpl b/view/theme/diabook-aerith/nav.tpl
index 6fab83afc..6559c49ea 100644
--- a/view/theme/diabook-aerith/nav.tpl
+++ b/view/theme/diabook-aerith/nav.tpl
@@ -26,6 +26,7 @@
<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li>
</ul>
</li>
+
{{ endif }}
{{ if $nav.messages }}
@@ -45,7 +46,7 @@
{{ if $nav.notifications }}
<li id="nav-notifications-linkmenu" class="nav-menu-icon">
<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
- <span class="icon notify">$nav.notifications.1</span>
+ <span class="icon notify">$nav.notifications.1</span>
<span id="notify-update" class="nav-notify"></span></a>
<ul id="nav-notifications-menu" class="menu-popup">
<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
@@ -63,16 +64,18 @@
</li>
{{ endif }}
+ <li style="width: 1%; height: 1px;float: right;"></li>
+
<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.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}
{{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
-
- {{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
+
+ {{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
<li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
-
+
{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.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 }}
@@ -82,13 +85,13 @@
</ul>
</li>
+
{{ if $nav.directory }}
<li id="nav-directory-link" class="nav-menu $sel.directory">
<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.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>
@@ -137,9 +140,10 @@
</nav>
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook-aerith/icons/scroll_top.png" title="scroll to top"></a></div>
+<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
-<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook-aerith/icons/bluebug.png" title="report bugs for the theme diabook-aerith"/></a></div>
+<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
+
diff --git a/view/theme/diabook-aerith/nets.tpl b/view/theme/diabook-aerith/nets.tpl
index 5addf38b1..637b7a04d 100644
--- a/view/theme/diabook-aerith/nets.tpl
+++ b/view/theme/diabook-aerith/nets.tpl
@@ -3,9 +3,9 @@
<div id="nets-desc">$desc</div>
<ul class="nets-ul">
- <li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
+ <li class="tool {{ if $sel_all }}selected{{ endif }}"><a style="text-decoration: none;" href="$base" class="nets-link nets-all">$all</a></li>
{{ for $nets as $net }}
- <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+ <li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?nets=$net.ref" class="nets-link nets-selected">$net.name</a></li>
{{ endfor }}
</ul>
</div>
diff --git a/view/theme/diabook-blue/group_side.tpl b/view/theme/diabook-blue/group_side.tpl
index 642019049..8600402f2 100644..100755
--- a/view/theme/diabook-blue/group_side.tpl
+++ b/view/theme/diabook-blue/group_side.tpl
@@ -25,5 +25,10 @@
{{ endfor }}
</ul>
</div>
+ {{ if $ungrouped }}
+ <div id="sidebar-ungrouped">
+ <a href="nogroup">$ungrouped</a>
+ </div>
+ {{ endif }}
</div>
diff --git a/view/theme/diabook-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl
index fd29d9309..6559c49ea 100644
--- a/view/theme/diabook-blue/nav.tpl
+++ b/view/theme/diabook-blue/nav.tpl
@@ -26,6 +26,7 @@
<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li>
</ul>
</li>
+
{{ endif }}
{{ if $nav.messages }}
@@ -63,16 +64,18 @@
</li>
{{ endif }}
+ <li style="width: 1%; height: 1px;float: right;"></li>
+
<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.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}
{{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
-
- {{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
+
+ {{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
<li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
-
+
{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.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 }}
@@ -82,13 +85,13 @@
</ul>
</li>
+
{{ if $nav.directory }}
<li id="nav-directory-link" class="nav-menu $sel.directory">
<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.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>
@@ -143,6 +146,7 @@
+
<ul id="nav-notifications-template" style="display:none;" rel="template">
<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
</ul>
diff --git a/view/theme/diabook-blue/nets.tpl b/view/theme/diabook-blue/nets.tpl
index 5addf38b1..637b7a04d 100644
--- a/view/theme/diabook-blue/nets.tpl
+++ b/view/theme/diabook-blue/nets.tpl
@@ -3,9 +3,9 @@
<div id="nets-desc">$desc</div>
<ul class="nets-ul">
- <li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
+ <li class="tool {{ if $sel_all }}selected{{ endif }}"><a style="text-decoration: none;" href="$base" class="nets-link nets-all">$all</a></li>
{{ for $nets as $net }}
- <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+ <li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?nets=$net.ref" class="nets-link nets-selected">$net.name</a></li>
{{ endfor }}
</ul>
</div>
diff --git a/view/theme/diabook-red/group_side.tpl b/view/theme/diabook-red/group_side.tpl
index 642019049..8600402f2 100644..100755
--- a/view/theme/diabook-red/group_side.tpl
+++ b/view/theme/diabook-red/group_side.tpl
@@ -25,5 +25,10 @@
{{ endfor }}
</ul>
</div>
+ {{ if $ungrouped }}
+ <div id="sidebar-ungrouped">
+ <a href="nogroup">$ungrouped</a>
+ </div>
+ {{ endif }}
</div>
diff --git a/view/theme/diabook-red/nav.tpl b/view/theme/diabook-red/nav.tpl
index dc3fd0cde..6559c49ea 100644
--- a/view/theme/diabook-red/nav.tpl
+++ b/view/theme/diabook-red/nav.tpl
@@ -26,6 +26,7 @@
<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li>
</ul>
</li>
+
{{ endif }}
{{ if $nav.messages }}
@@ -63,16 +64,18 @@
</li>
{{ endif }}
+ <li style="width: 1%; height: 1px;float: right;"></li>
+
<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.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}
{{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
-
- {{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
+
+ {{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
<li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
-
+
{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.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 }}
@@ -82,13 +85,13 @@
</ul>
</li>
+
{{ if $nav.directory }}
<li id="nav-directory-link" class="nav-menu $sel.directory">
<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.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>
@@ -137,9 +140,10 @@
</nav>
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook-red/icons/scroll_top.png" title="scroll to top"></a></div>
+<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
-<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook-red/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
+<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
+
diff --git a/view/theme/diabook-red/nets.tpl b/view/theme/diabook-red/nets.tpl
index 5addf38b1..637b7a04d 100644
--- a/view/theme/diabook-red/nets.tpl
+++ b/view/theme/diabook-red/nets.tpl
@@ -3,9 +3,9 @@
<div id="nets-desc">$desc</div>
<ul class="nets-ul">
- <li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
+ <li class="tool {{ if $sel_all }}selected{{ endif }}"><a style="text-decoration: none;" href="$base" class="nets-link nets-all">$all</a></li>
{{ for $nets as $net }}
- <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+ <li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?nets=$net.ref" class="nets-link nets-selected">$net.name</a></li>
{{ endfor }}
</ul>
</div>
diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl
index 642019049..1c8ebcd9f 100755
--- a/view/theme/diabook/group_side.tpl
+++ b/view/theme/diabook/group_side.tpl
@@ -25,5 +25,10 @@
{{ endfor }}
</ul>
</div>
+ {{ if $ungrouped }}
+ <div id="sidebar-ungrouped">
+ <a href="nogroup">$ungrouped</a>
+ </div>
+ {{ endif }}
</div>
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 522fb22b4..6559c49ea 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -64,6 +64,8 @@
</li>
{{ endif }}
+ <li style="width: 1%; height: 1px;float: right;"></li>
+
<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.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}
diff --git a/view/theme/diabook/nets.tpl b/view/theme/diabook/nets.tpl
index 5addf38b1..637b7a04d 100644
--- a/view/theme/diabook/nets.tpl
+++ b/view/theme/diabook/nets.tpl
@@ -3,9 +3,9 @@
<div id="nets-desc">$desc</div>
<ul class="nets-ul">
- <li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
+ <li class="tool {{ if $sel_all }}selected{{ endif }}"><a style="text-decoration: none;" href="$base" class="nets-link nets-all">$all</a></li>
{{ for $nets as $net }}
- <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+ <li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?nets=$net.ref" class="nets-link nets-selected">$net.name</a></li>
{{ endfor }}
</ul>
</div>