diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/admin_aside.tpl | 1 | ||||
| -rw-r--r-- | view/tpl/attach_edit.tpl | 43 | ||||
| -rwxr-xr-x | view/tpl/channel.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/channels.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/cloud_actionspanel.tpl | 10 | ||||
| -rwxr-xr-x | view/tpl/photos_upload.tpl | 38 |
6 files changed, 53 insertions, 51 deletions
diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl index 2ab3edcc2..013b72d50 100755 --- a/view/tpl/admin_aside.tpl +++ b/view/tpl/admin_aside.tpl @@ -18,7 +18,6 @@ <li><a href='{{$admin.channels.0}}'>{{$admin.channels.1}}</a></li> <li><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li> <li><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li> - <li><a href='{{$admin.hubloc.0}}'>{{$admin.hubloc.1}}</a></li> <li><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li> </ul> </div> diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl index 033ee40a7..82f2a7628 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -1,6 +1,10 @@ <form action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" > + <input type="hidden" name="channelnick" value="{{$channelnick}}" /> + <input type="hidden" name="filehash" value="{{$file.hash}}" /> + <input type="hidden" name="uid" value="{{$uid}}" /> + <input type="hidden" name="fileid" value="{{$file.id}}" /> - <div id="attach-edit-tools" class="btn-group form-group"> + <div id="attach-edit-tools-share" class="btn-group form-group"> {{if !$isadir}} <a href="/rpost?body=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-default btn-xs"> <i class="icon-paperclip jot-icons"></i> @@ -10,28 +14,25 @@ <i class="icon-share jot-icons"></i> </button> </div> - <div id="attach-edit-perms" class="btn-group form-group pull-right"> - <button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> - <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i> - </button> - <button id="dbtn-submit" class="btn btn-primary btn-xs" type="submit" name="submit"> - {{$submit}} - </button> + <div id="attach-edit-tools-perms" class="form-group pull-right{{if $isadir}} btn-group{{/if}}"> + {{if $isadir}} + <div id="attach-edit-perms-recurse" class="btn-group" data-toggle="buttons"> + <label class="btn btn-default btn-xs" title="{{$recurse}}"> + <input type="checkbox" autocomplete="off" name="recurse" value="1"><i class="icon-level-down jot-icons"></i> + </label> + </div> + {{/if}} + <div id="attach-edit-perms" class="btn-group"> + <button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i> + </button> + <button id="dbtn-submit" class="btn btn-primary btn-xs" type="submit" name="submit"> + {{$submit}} + </button> + </div> </div> - {{$aclselect}} - <input type="hidden" name="channelnick" value="{{$channelnick}}" /> - <input type="hidden" name="filehash" value="{{$file.hash}}" /> - <input type="hidden" name="uid" value="{{$uid}}" /> - <input type="hidden" name="fileid" value="{{$file.id}}" /> - - {{if $isadir}} - <div class="form-group"> - <label id="attach-edit-recurse-text" class="checkbox-inline" for="attach-recurse-input" > - <input class="checkbox-inline" id="attach-recurse-input" type="checkbox" name="recurse" value="1" />{{$recurse}} - </label> - </div> - {{/if}} + {{$aclselect}} <div id="link-code" class="form-group"> <label for="">{{$cpldesc}}</label> diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl index c151ba8b2..af80e7b4d 100755 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -1,4 +1,4 @@ -<div class="channel-selection"> +<div class='channel-selection {{if $selected == $channel.channel_id}}selected-channel{{/if}}'> {{if $channel.default_links}} {{if $channel.default}} <div class="channel-selection-default default"><i class="icon-check"></i> {{$msg_default}}</div> @@ -10,5 +10,3 @@ <div class="channels-notifications-wrapper"><a href='manage/{{$channel.channel_id}}/message' style="{{if $channel.mail != 0}}color:#c60032;{{/if}}" title='{{$channel.mail|string_format:$mail_format}}'><i class="icon-envelope"></i> {{$channel.mail}}</a> <a href='manage/{{$channel.channel_id}}/connections/ifpending' style="{{if $channel.intros != 0}}color:#c60032;{{/if}}" title='{{$channel.intros|string_format:$intros_format}}'><i class="icon-user"></i> {{$channel.intros}}</a></div> <a href="{{$channel.link}}" class="channel-selection-name-link" title="{{$channel.channel_name}}"><div class="channel-name">{{$channel.channel_name}}</div></a> </div> - -<div class="channel-selection-end"></div> diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index 0dec68a53..26d0e14d2 100755 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -13,14 +13,6 @@ {{$channel_usage_message}} </div> {{/if}} -{{if $selected}} -<div id="selected-channel"> -<div id="channels-selected">{{$msg_selected}}</div> -{{include file="channel.tpl" channel=$selected}} -</div> -<div class="channels-end selected"></div> -{{/if}} -<br /> <div id="channels-desc" class="descriptive-text">{{$desc}}</div> <div id="all-channels"> diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index d88bc94c4..da708a98c 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -2,16 +2,18 @@ <label for="files-mkdir">{{$folder_header}}</label> <form method="post" action=""> <input type="hidden" name="sabreAction" value="mkcol"> - <input id="files-mkdir" type="text" name="name"> - <input type="submit" value="{{$folder_submit}}"> + <input id="files-mkdir" type="text" name="name" class="form-control form-group"> + <button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$folder_submit}}">{{$folder_submit}}</button> </form> + <div class="clear"></div> </div> <div id="files-upload-tools" class="section-content-tools-wrapper form-group"> <label for="files-upload">{{$upload_header}}</label> <form method="post" action="" enctype="multipart/form-data"> <input type="hidden" name="sabreAction" value="put"> - <input id="files-upload" type="file" name="file" style="display: inline;"> - <input type="submit" value="{{$upload_submit}}"> + <input class="form-group" id="files-upload" type="file" name="file"> + <button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$upload_submit}}">{{$upload_submit}}</button> <!-- Name (optional): <input type="text" name="name"> we should rather provide a rename action in edit form--> </form> + <div class="clear"></div> </div> diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 10fc82648..6cd7e3eb9 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -18,30 +18,40 @@ {{$aclselect}} {{if $default}} - <div class="pull-left"> + <div class="form-group"> <input id="photos-upload-choose" type="file" name="userfile" /> </div> - <div class="btn-group pull-right"> - <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> - <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> - </button> - <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button> + <div class="pull-right btn-group form-group"> + <div class="btn-group" data-toggle="buttons"> + <label class="btn btn-default btn-sm" title="{{$nosharetext}}"> + <input class="checkbox-inline" id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" /><i class="icon-ban-circle"></i> + </label> + </div> + <div class="btn-group"> + {{if $lockstate}} + <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> + </button> + {{/if}} + <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button> + </div> + </div> {{/if}} - <div class="clear"></div> - <div class="checkbox"> - <label class="checkbox-inline" for="photos-upload-noshare" > - <input class="checkbox-inline" id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />{{$nosharetext}} - </label> - </div> - {{if $uploader}} - <div id="photos-upload-perms" class="pull-right"> + <div id="photos-upload-perms" class="btn-group pull-right"> + <div class="btn-group" data-toggle="buttons"> + <label class="btn btn-default btn-sm" title="{{$nosharetext}}"> + <input class="checkbox-inline" id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" /><i class="icon-ban-circle"></i> + </label> + </div> + {{if $lockstate}} <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> </button> + {{/if}} <div class="pull-right"> {{$uploader}} </div> |