diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/admin_aside.tpl | 1 | ||||
| -rw-r--r-- | view/tpl/attach_edit.tpl | 61 | ||||
| -rwxr-xr-x | view/tpl/channel.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/cloud_actionspanel.tpl | 11 | ||||
| -rw-r--r-- | view/tpl/cloud_directory.tpl | 22 |
5 files changed, 53 insertions, 44 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 bf39e6158..033ee40a7 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -1,34 +1,41 @@ <form action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" > -<div id="attach-edit-perms" > -<button id="dbtn-acl" class="btn btn-default btn-sm" 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-sm" type="submit" name="submit"> - {{$submit}} -</button> -</div> + <div id="attach-edit-tools" 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> + </a> + {{/if}} + <button id="link-btn" class="btn btn-default btn-xs" type="button" onclick="openClose('link-code');"> + <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> + {{$aclselect}} -{{$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}}" /> -<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 id="attach-edit-recurse" > - <label id="attach-edit-recurse-text" for="attach-recurse-input" >{{$recurse}}</label> - <input id="attach-recurse-input" type="checkbox" name="recurse" value="1" /> -</div> -{{else}} -<div class="cut-paste-desc">{{$cpdesc}}</div> -<input type="text" id="cutpasteinput" name="cutpastelink" value="[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" onclick="this.select();" /><br /> -{{/if}} - -<div class="cut-paste-desc">{{$cpldesc}}</div> -<input type="text" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/><br /> -<div class="clear"></div> + {{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}} + <div id="link-code" class="form-group"> + <label for="">{{$cpldesc}}</label> + <input type="text" class="form-control" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/> + </div> </form> diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl index 55b122d9b..c151ba8b2 100755 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -7,7 +7,7 @@ {{/if}} {{/if}} <a href="{{$channel.link}}" class="channel-selection-photo-link" title="{{$channel.channel_name}}"><img class="channel-photo" src="{{$channel.xchan_photo_m}}" alt="{{$channel.channel_name}}" /></a> -<div class="channels-notifications-wrapper">{{if $channel.mail != 0}}<span style="color:#c60032;"><i class="icon-envelope"></i> {{$channel.mail}}</span>{{else}}<i class="icon-envelope"></i> {{/if}} {{if $channel.intros != 0}}<span style="color:#c60032;"><i class="icon-user"></i> {{$channel.intros}}</span>{{else}}<i class="icon-user"></i> {{/if}}</div> +<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> diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index d88bc94c4..0e621e9db 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -2,16 +2,17 @@ <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="pull-left" 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/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 99bba9474..77d861224 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -1,12 +1,12 @@ -<div class="section-content-wrapper generic-content-wrapper"> +<div class="generic-content-wrapper section-content-wrapper-np"> <table id="cloud-index"> <tr> - <th></th> - <th>{{$name}}</th> - <th></th><th></th><th></th><th></th> - <th>{{*{{$type}}*}}</th> - <th class="hidden-xs">{{$size}}</th> - <th class="hidden-xs">{{$lastmod}}</th> + <th width="1%"></th> + <th width="92%">{{$name}}</th> + <th width="1%"></th><th width="1%"></th><th width="1%"></th><th width="1%"></th> + <th width="1%">{{*{{$type}}*}}</th> + <th width="1%" class="hidden-xs">{{$size}}</th> + <th width="1%" class="hidden-xs">{{$lastmod}}</th> </tr> {{if $parentpath}} <tr> @@ -19,14 +19,14 @@ </tr> {{/if}} {{foreach $entries as $item}} - <tr id="cloud-panel-{{$item.attachId}}"> + <tr id="cloud-index-{{$item.attachId}}"> <td><i class="{{$item.iconFromType}}" title="{{$item.type}}"></i></td> <td><a href="{{$item.fullPath}}">{{$item.displayName}}</a></td> {{if $item.is_owner}} <td class="cloud-index-tool">{{$item.attachIcon}}</td> <td id="file-edit-{{$item.attachId}}" class="cloud-index-tool"></td> <td class="cloud-index-tool"><i class="fakelink icon-pencil" onclick="filestorage(event, '{{$nick}}', {{$item.attachId}});"></i></td> - <td class="cloud-index-tool"><a href="{{$item.fileStorageUrl}}/{{$item.attachId}}/delete" title="{{$delete}}" onclick="return confirmDelete();"><i class="icon-remove drop-icons"></i></a></td> + <td class="cloud-index-tool"><a href="{{$item.fileStorageUrl}}/{{$item.attachId}}/delete" title="{{$delete}}" onclick="return confirmDelete();"><i class="icon-trash drop-icons"></i></a></td> {{else}} <td></td><td></td><td></td><td></td> @@ -35,7 +35,9 @@ <td class="hidden-xs">{{$item.sizeFormatted}}</td> <td class="hidden-xs">{{$item.lastmodified}}</td> </tr> - <tr><td id="perms-panel-{{$item.attachId}}" colspan="9"></td></tr> + <tr> + <td id="perms-panel-{{$item.attachId}}" colspan="9"></td> + </tr> {{/foreach}} </table> </div> |