aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/css/mod_photos.css3
-rwxr-xr-xview/tpl/nav.tpl12
-rwxr-xr-xview/tpl/photo_view.tpl7
3 files changed, 13 insertions, 9 deletions
diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css
index c8cdab6c3..571aba57c 100644
--- a/view/css/mod_photos.css
+++ b/view/css/mod_photos.css
@@ -3,7 +3,8 @@
margin-bottom: 25px;
}
-.photo-item-tools {
+.photo-item-tools-left,
+.photo-item-tools-right {
padding: 7px 10px;
}
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index bc9d0ba37..a283b35a8 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -50,12 +50,16 @@
{{if $nav.register}}<li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}}
{{if !$userinfo}}
{{if $nav.loginmenu}}
- <li class="{{$nav.loginmenu.0.2}}"><a data-toggle="dropdown" data-target="#" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" >{{$nav.loginmenu.0.1}} <span class="caret" id="usermenu-caret"></span></a>
- <ul class="dropdown-menu" role="menu">
+ <li class="{{$nav.loginmenu.0.2}} hidden-xs"><a data-toggle="dropdown" data-target="#" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" >{{$nav.loginmenu.0.1}} <span class="caret" id="usermenu-caret"></span></a>
+ <ul class="dropdown-menu" role="menu">
+ {{foreach $nav.loginmenu as $loginmenu}}
+ <li role="presentation"><a class="{{$loginmenu.2}}" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem">{{$loginmenu.1}}</a></li>
+ {{/foreach}}
+ </ul>
+ </li>
{{foreach $nav.loginmenu as $loginmenu}}
- <li role="presentation"><a class="{{$loginmenu.2}}" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem">{{$loginmenu.1}}</a></li>
+ <li role="presentation"><a class="{{$loginmenu.2}} visible-xs" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem">{{$loginmenu.1}}</a></li>
{{/foreach}}
- </ul></li>
{{/if}}
{{/if}}
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 88f9577b4..ddbce5b0b 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -67,7 +67,7 @@
{{$edit.aclselect}}
<div id="settings-default-perms-menu-end"></div>
</div>
-< <br/>
+ <br/>
<div id="settings-default-perms-end"></div>
<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$edit.submit}}">
<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();">
@@ -82,17 +82,16 @@
<div id="photo-photo-end"></div>
<div class="photo-item-tools">
+ {{if $tags}}
<div class="photo-item-tools-left pull-left">
- {{if $tags}}
<div id="in-this-photo">
<span id="in-this-photo-text">{{$tag_hdr}}</span>
{{foreach $tags as $t}}
{{$t.0}}{{if $edit}}<span id="tag-remove">&nbsp;<a href="{{$t.1}}"><i class="icon-remove"></i></a>&nbsp;</span>{{/if}}
{{/foreach}}
</div>
- {{/if}}
-
</div>
+ {{/if}}
{{if $likebuttons}}
<div class="photo-item-tools-right btn-group pull-right">