aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/nav.tpl4
-rwxr-xr-xview/tpl/photo_albums.tpl4
-rwxr-xr-xview/tpl/photo_view.tpl36
-rwxr-xr-xview/tpl/suggest_friends.tpl4
4 files changed, 28 insertions, 20 deletions
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index dd3f67f45..fa51526d2 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -74,7 +74,7 @@
</li>
<li class="{{$sel.home}} visible-xs">
<a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="icon-home"></i></a>
- <span class="home-update badge"rel="#nav-home-menu"></span>
+ <span class="home-update badge" rel="#nav-home-menu"></span>
</li>
{{/if}}
@@ -173,5 +173,3 @@
</ul>
</div>
</div>
-
-
diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
index e83eefb39..7ff4a8cc0 100755
--- a/view/tpl/photo_albums.tpl
+++ b/view/tpl/photo_albums.tpl
@@ -3,7 +3,9 @@
{{if $albums}}
<ul>
{{foreach $albums as $al}}
-<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}</a></li>
+{{if $al.text}}
+<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}</a> ({{$al.total}})</li>
+{{/if}}
{{/foreach}}
</ul>
{{/if}}
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index b34f3fcf5..0c16eb362 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -5,11 +5,11 @@
{{if $tools}}
<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
{{/if}}
-{{if $lock}} | <i class="lockview icon-lock" title="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" ></i> {{/if}}
+{{if $lock}} | <i class="lockview icon-lock" title="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');"></i> {{/if}}
</div>
{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><i class="icon-backward photo-icons"></i></div>{{/if}}
-<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;" ><img style="max-width: 100%;" src="{{$photo.src}}" /></a></div>
+<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="max-width: 100%;" src="{{$photo.src}}"></a></div>
{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><i class="icon-forward photo-icons"></i></a></div>{{/if}}
<div id="photo-photo-end"></div>
<div id="photo-caption">{{$desc}}</div>
@@ -24,22 +24,30 @@
{{if $edit}}
<div id="photo-edit-edit-wrapper" class="fakelink" onclick="openClose('photo-edit-edit');">{{$edit.edit}}</div>
<div id="photo-edit-edit" style="display: none;">
-<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form" >
+<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form">
- <input type="hidden" name="item_id" value="{{$edit.item_id}}" />
+ <input type="hidden" name="item_id" value="{{$edit.item_id}}">
<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum}}</label>
- <input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$edit.album}}" />
-
+ <input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$edit.album}}" list="dl-albums">
+{{if $edit.albums}}
+ <datalist id="dl-albums">
+ {{foreach $edit.albums as $al}}
+ {{if $al.text}}
+ <option value="{{$al.text}}">
+ {{/if}}
+ {{/foreach}}
+ </datalist>
+{{/if}}
<div id="photo-edit-albumname-end"></div>
<label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label>
- <input id="photo-edit-caption" type="text" size="84" name="desc" value="{{$edit.caption}}" />
+ <input id="photo-edit-caption" type="text" size="84" name="desc" value="{{$edit.caption}}">
<div id="photo-edit-caption-end"></div>
<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$edit.tag_label}}</label>
- <input name="newtag" id="photo-edit-newtag" size="84" title="{{$edit.help_tags}}" type="text" />
+ <input name="newtag" id="photo-edit-newtag" size="84" title="{{$edit.help_tags}}" type="text">
<div id="photo-edit-tags-end"></div>
<div id="photo-edit-rotate-wrapper">
@@ -47,13 +55,13 @@
{{$edit.rotatecw}}<br>
{{$edit.rotateccw}}
</div>
- <input type="radio" name="rotate" value="1" /><br>
- <input type="radio" name="rotate" value="2" />
+ <input type="radio" name="rotate" value="1"><br>
+ <input type="radio" name="rotate" value="2">
</div>
<div id="photo-edit-rotate-end"></div>
- <div id="settings-default-perms" class="settings-default-perms" >
- <span id="jot-perms-icon" class="{{$edit.lockstate}}" ></span>
+ <div id="settings-default-perms" class="settings-default-perms">
+ <span id="jot-perms-icon" class="{{$edit.lockstate}}"></span>
<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$edit.permissions}}</button>
{{$edit.aclselect}}
<div id="settings-default-perms-menu-end"></div>
@@ -61,8 +69,8 @@
<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()"; />
+ <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();">
<div id="photo-edit-end"></div>
</form>
diff --git a/view/tpl/suggest_friends.tpl b/view/tpl/suggest_friends.tpl
index 6cf8f7ba8..2008193f9 100755
--- a/view/tpl/suggest_friends.tpl
+++ b/view/tpl/suggest_friends.tpl
@@ -1,16 +1,16 @@
<div class="profile-match-wrapper">
- <a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="profile-match-ignore" onclick="return confirmDelete();" ><i class="icon-remove drop-icons"></i></a>
<div class="profile-match-photo">
<a href="{{$entry.url}}">
<img src="{{$entry.photo}}" alt="{{$entry.name}}" width="80" height="80" title="{{$entry.name}} [{{$entry.profile}}]" />
</a>
</div>
+ <a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="profile-match-ignore" onclick="return confirmDelete();" ><i class="icon-remove drop-icons btn btn-default"></i></a>
<div class="profile-match-break"></div>
<div class="profile-match-name">
<a href="{{$entry.url}}" title="{{$entry.name}}">{{$entry.name}}</a>
</div>
<div class="profile-match-end"></div>
{{if $entry.connlnk}}
- <div class="profile-match-connect"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}"><i class="icon-plus connect-icon"></i> {{$entry.conntxt}}</a></div>
+ <div class="profile-match-connect btn btn-default"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}"><i class="icon-plus connect-icon"></i> {{$entry.conntxt}}</a></div>
{{/if}}
</div>