diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/album_edit.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/photo_album.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/photo_albums.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/photos_recent.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/photos_upload.tpl | 51 | ||||
| -rw-r--r-- | view/tpl/smarty3/README | 4 |
7 files changed, 36 insertions, 37 deletions
diff --git a/view/tpl/album_edit.tpl b/view/tpl/album_edit.tpl index a65887d3c..a6815352a 100755 --- a/view/tpl/album_edit.tpl +++ b/view/tpl/album_edit.tpl @@ -1,4 +1,4 @@ -<div id="photo-album-edit-wrapper"> +<div id="photo-album-edit-wrapper" class="section-content-tools-wrapper"> <form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" > diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index 0a26fc367..2c0b8e5b9 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -5,13 +5,14 @@ {{/if}} <a class="btn btn-default" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a> {{if $can_post}} - <a class="btn btn-xs btn-success" href="{{$upload.1}}"><i class="icon-upload"></i> {{$upload.0}}</a> + <button class="btn btn-xs btn-success" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="icon-upload"></i> {{$upload.0}}</button> {{/if}} </div> <h2>{{$album}}</h2> <div class="clear"></div> </div> +{{$upload_form}} {{$album_edit.1}} <div id="photo-album-contents" class="generic-content-wrapper"> {{foreach $photos as $photo}} diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index 0f8b809ac..de1105bbc 100755 --- a/view/tpl/photo_albums.tpl +++ b/view/tpl/photo_albums.tpl @@ -1,17 +1,13 @@ <div id="side-bar-photos-albums" class="widget"> <h3>{{$title}}</h3> <ul class="nav nav-pills nav-stacked"> - {{if $upload}} - <li><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></li> - {{/if}} <li><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >Recent Photos</a></li> - {{if $albums}} + {{if $albums}} {{foreach $albums as $al}} {{if $al.text}} <li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge pull-right">{{$al.total}}</span>{{$al.text}}</a></li> {{/if}} {{/foreach}} - - {{/if}} + {{/if}} </ul> </div> diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index c79cd7d56..d1b077f36 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -31,7 +31,7 @@ <div class="clear"></div> </div> - <div id="photo-edit-edit"> + <div id="photo-edit-edit" class="section-content-tools-wrapper"> <form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form"> <input type="hidden" name="item_id" value="{{$edit.item_id}}" /> <label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum}}</label> diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 91b088c93..7727abcea 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -1,10 +1,11 @@ <div class="section-title-wrapper"> {{if $can_post}} - <a class="btn btn-xs btn-success pull-right" href="{{$upload.1}}"><i class="icon-upload"></i> {{$upload.0}}</a> + <button class="btn btn-xs btn-success pull-right" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="icon-upload"></i> {{$upload.0}}</button> {{/if}} <h2>{{$title}}</h2> <div class="clear"></div> </div> +{{$upload_form}} <div id="photo-album-contents" class="generic-content-wrapper"> {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 3db292f02..5bb0092d6 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -1,18 +1,12 @@ -<div class="generic-content-wrapper"> - <div class="section-title-wrapper"> - <div id="photos-usage-message" class="pull-right">{{$usage}}</div> - <h2>{{$pagename}}</h2> - <div class="clear"></div> - </div> - - <div class="section-content-wrapper"> +<div id="photo-upload-form" class="generic-content-wrapper"> + <div class="section-content-tools-wrapper"> <form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form"> <input type="hidden" id="photos-upload-source" name="source" value="photos" /> - <div id="photos-album-name-label" > - <label id="photos-upload-newalbum-text" for="photos-upload-newalbum">{{$newalbum}}</label> - </div> - <div id="photos-album-name-input"> - <input id="photos-upload-newalbum" type="text" value="{{$selname}}" name="newalbum" list="dl-photo-upload" /> + + + <div class="form-group"> + <label for="photos-upload-album">{{$newalbum_label}}</label> + <input type="text" class="form-control" id="photos-upload-album" name="newalbum" placeholder="{{$newalbum_placeholder}}" value="{{$selname}}" list="dl-photo-upload"> <datalist id="dl-photo-upload"> {{foreach $albums as $al}} {{if $al.text}} @@ -22,27 +16,38 @@ </datalist> </div> + {{$aclselect}} + + {{if $default}} + <div class="form-group pull-left"> + <input id="photos-upload-choose" type="file" name="userfile" /> + </div> + <div class="btn-group pull-right"> + <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i> + </button> + <button class="btn btn-primary btn-sm" type="submit" name="submit" id="photos-upload-submit">{{$submit}}</button> + </div> + {{/if}} + <div id="photos-upload-new-end"></div> - <div id="photos-upload-noshare-div" class="photos-upload-noshare-div" > - <input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" /> - <label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label> + <div class="form-group" id="photos-upload-noshare"> + <label id="photos-upload-noshare-text" for="photos-upload-noshare" > + <input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" /> {{$nosharetext}} + </label> </div> + {{if $uploader}} + <div id="photos-upload-noshare-end"></div> <div id="photos-upload-perms" class="photos-upload-perms" > <span id="jot-perms-icon" class="icon-{{$lockstate}}" ></span> <button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> </div> - - {{$aclselect}} - <div id="photos-upload-perms-end"></div> - - <div id="photos-upload-spacer"></div> - {{$uploader}} + {{/if}} - {{$default}} <div class="photos-upload-end" ></div> </form> diff --git a/view/tpl/smarty3/README b/view/tpl/smarty3/README deleted file mode 100644 index 78ff8d9a1..000000000 --- a/view/tpl/smarty3/README +++ /dev/null @@ -1,4 +0,0 @@ -view/tpl/smarty3 - -This directory must exist and be writeable by the webserver in order to store compiled template files, which are created dynamically. Please see the installation instructions. - |