Skip to content

Commit ca0b581

Browse files
joni2backjoni2back
committed
Merge pull request #31 from silentHoo/pr-more-configuration-options
adds more configuration options to make a better fine tuning ... (take into account enableCompressChooseName)
2 parents e33d56a + 398c0e8 commit ca0b581

File tree

4 files changed

+32
-22
lines changed

4 files changed

+32
-22
lines changed

‎assets/js/config.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,19 @@
1717
extractUrl: "bridges/php/handler.php",
1818
permissionsUrl: "bridges/php/handler.php",
1919

20-
enablePermissionsModule: true,
20+
allowedActions: {
21+
rename: true,
22+
copy: true,
23+
edit: true,
24+
changePermissions: true,
25+
compress: true,
26+
extract: true,
27+
download: true,
28+
preview: true,
29+
delete: true
30+
},
31+
2132
enablePermissionsRecursive: true,
22-
enableCompressChooseName: false,
2333

2434
isEditableFilePattern: '\\.(txt|html|htm|aspx|asp|ini|pl|py|md|php|css|js|log|htaccess|htpasswd|json|sql|xml|xslt|sh|rb|as|bat|cmd|coffee|php[3-6]|java|c|cbl|go|h|scala|vb)$',
2535
isImageFilePattern: '\\.(jpg|jpeg|gif|bmp|png|svg|tiff)$',

‎assets/templates/item-context-menu.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<div id="context-menu" class="dropdown clearfix animated fast fadeIn">
22
<ul class="dropdown-menu dropdown-right-click" role="menu" aria-labelledby="dropdownMenu" style="">
3-
<li><a href="" tabindex="-1" data-toggle="modal" data-target="#rename"><i class="glyphicon glyphicon-edit"></i> {{'rename' | translate}}</a></li>
4-
<li><a href="" tabindex="-1" data-toggle="modal" data-target="#copy" data-ng-show="!temp.isFolder()"><i class="glyphicon glyphicon-log-out"></i> {{'copy' | translate}}</a></li>
5-
<li><a href="" tabindex="-1" data-toggle="modal" data-target="#edit" data-ng-show="temp.isEditable()" data-ng-click="temp.getContent();"><i class="glyphicon glyphicon-pencil"></i> {{'edit' | translate}}</a></li>
6-
<li ng-show="config.enablePermissionsModule"><a href="" tabindex="-1" data-toggle="modal" data-target="#changepermissions"><i class="glyphicon glyphicon-lock"></i> {{'permissions' | translate}}</a></li>
7-
<li><a href="" tabindex="-1" data-toggle="modal" data-target="#compress" data-ng-show="temp.isCompressible()" ><i class="glyphicon glyphicon-compressed"></i> {{'compress' | translate}}</a></li>
8-
<li><a href="" tabindex="-1" data-toggle="modal" data-target="#extract" ng-click="temp.tempModel.name=''" data-ng-show="temp.isExtractable()" ><i class="glyphicon glyphicon-export"></i> {{'extract' | translate}}</a></li>
9-
<li><a href="" tabindex="-1" data-ng-show="!temp.isFolder()" data-ng-click="temp.download()"><i class="glyphicon glyphicon-download"></i> {{'download' | translate}}</a></li>
10-
<li><a href="" tabindex="-1" data-ng-show="temp.isImage()" data-ng-click="temp.preview()"><i class="glyphicon glyphicon-picture"></i> {{'view_item' | translate}}</a></li>
3+
<li data-ng-show="config.allowedActions.rename"><a href="" tabindex="-1" data-toggle="modal" data-target="#rename"><i class="glyphicon glyphicon-edit"></i> {{'rename' | translate}}</a></li>
4+
<li data-ng-show="config.allowedActions.copy && !temp.isFolder()"><a href="" tabindex="-1" data-toggle="modal" data-target="#copy"><i class="glyphicon glyphicon-log-out"></i> {{'copy' | translate}}</a></li>
5+
<li data-ng-show="config.allowedActions.edit && temp.isEditable()"><a href="" tabindex="-1" data-toggle="modal" data-target="#edit" data-ng-click="temp.getContent();"><i class="glyphicon glyphicon-pencil"></i> {{'edit' | translate}}</a></li>
6+
<li data-ng-show="config.allowedActions.changePermissions"><a href="" tabindex="-1" data-toggle="modal" data-target="#changepermissions"><i class="glyphicon glyphicon-lock"></i> {{'permissions' | translate}}</a></li>
7+
<li data-ng-show="config.allowedActions.compress && temp.isCompressible()"><a href="" tabindex="-1" data-toggle="modal" data-target="#compress"><i class="glyphicon glyphicon-compressed"></i> {{'compress' | translate}}</a></li>
8+
<li data-ng-show="config.allowedActions.extract && temp.isExtractable()"><a href="" tabindex="-1" data-toggle="modal" data-target="#extract" data-ng-click="temp.tempModel.name=''"><i class="glyphicon glyphicon-export"></i> {{'extract' | translate}}</a></li>
9+
<li data-ng-show="config.allowedActions.download && !temp.isFolder()"><a href="" tabindex="-1" data-ng-click="temp.download()"><i class="glyphicon glyphicon-download"></i> {{'download' | translate}}</a></li>
10+
<li data-ng-show="config.allowedActions.preview && temp.isImage()"><a href="" tabindex="-1" data-ng-click="temp.preview()"><i class="glyphicon glyphicon-picture"></i> {{'view_item' | translate}}</a></li>
1111
<li class="divider"></li>
12-
<li><a href="" tabindex="-1" data-toggle="modal" data-target="#delete"><i class="glyphicon glyphicon-trash"></i> {{'remove' | translate}}</a></li>
12+
<li data-ng-show="config.allowedActions.delete"><a href="" tabindex="-1" data-toggle="modal" data-target="#delete"><i class="glyphicon glyphicon-trash"></i> {{'remove' | translate}}</a></li>
1313
</ul>
1414
</div>

‎assets/templates/item-toolbar.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<div data-ng-show="!item.inprocess">
2-
<button class="btn btn-sm btn-default" data-toggle="modal" data-target="#rename" data-ng-click="touch(item)" title="{{'rename' | translate}}">
2+
<button class="btn btn-sm btn-default" data-toggle="modal" data-target="#rename" data-ng-show="config.allowedActions.rename" data-ng-click="touch(item)" title="{{'rename' | translate}}">
33
<i class="glyphicon glyphicon-edit"></i>
44
</button>
5-
<button class="btn btn-sm btn-default" data-toggle="modal" data-target="#copy" data-ng-show="!item.isFolder()" data-ng-click="touch(item)" title="{{'copy' | translate}}">
5+
<button class="btn btn-sm btn-default" data-toggle="modal" data-target="#copy" data-ng-show="config.allowedActions.copy && !item.isFolder()" data-ng-click="touch(item)" title="{{'copy' | translate}}">
66
<i class="glyphicon glyphicon-log-out"></i>
77
</button>
8-
<button class="btn btn-sm btn-default" data-toggle="modal" data-target="#edit" data-ng-show="item.isEditable()" data-ng-click="item.getContent(); touch(item)" title="{{'edit' | translate}}">
8+
<button class="btn btn-sm btn-default" data-toggle="modal" data-target="#edit" data-ng-show="config.allowedActions.edit && item.isEditable()" data-ng-click="item.getContent(); touch(item)" title="{{'edit' | translate}}">
99
<i class="glyphicon glyphicon-pencil"></i>
1010
</button>
11-
<button ng-show="config.enablePermissionsModule" class="btn btn-sm btn-default" data-toggle="modal" data-target="#changepermissions" data-ng-click="touch(item)" title="{{'permissions' | translate}}">
11+
<button class="btn btn-sm btn-default" data-toggle="modal" data-target="#changepermissions" data-ng-show="config.allowedActions.changePermissions" data-ng-click="touch(item)" title="{{'permissions' | translate}}">
1212
<i class="glyphicon glyphicon-lock"></i>
1313
</button>
14-
<button class="btn btn-sm btn-default" data-toggle="modal" data-target="#compress" data-ng-show="item.isCompressible()" data-ng-click="touch(item)" title="{{'compress' | translate}}">
14+
<button class="btn btn-sm btn-default" data-toggle="modal" data-target="#compress" data-ng-show="config.allowedActions.compress && item.isCompressible()" data-ng-click="touch(item)" title="{{'compress' | translate}}">
1515
<i class="glyphicon glyphicon-compressed"></i>
1616
</button>
17-
<button class="btn btn-sm btn-default" data-toggle="modal" data-target="#extract" data-ng-show="item.isExtractable()" data-ng-click="touch(item); item.tempModel.name=''" title="{{'extract' | translate}}">
17+
<button class="btn btn-sm btn-default" data-toggle="modal" data-target="#extract" data-ng-show="config.allowedActions.extract && item.isExtractable()" data-ng-click="touch(item); item.tempModel.name=''" title="{{'extract' | translate}}">
1818
<i class="glyphicon glyphicon-export"></i>
1919
</button>
20-
<button class="btn btn-sm btn-default" data-ng-show="!item.isFolder()" data-ng-click="item.download()" title="{{'download' | translate}}">
20+
<button class="btn btn-sm btn-default" data-ng-show="config.allowedActions.download && !item.isFolder()" data-ng-click="item.download()" title="{{'download' | translate}}">
2121
<i class="glyphicon glyphicon-cloud-download"></i>
2222
</button>
23-
<button class="btn btn-sm btn-default" data-ng-show="item.isImage()" data-ng-click="item.preview()" title="{{'view_item' | translate}}">
23+
<button class="btn btn-sm btn-default" data-ng-show="config.allowedActions.preview && item.isImage()" data-ng-click="item.preview()" title="{{'view_item' | translate}}">
2424
<i class="glyphicon glyphicon-picture"></i>
2525
</button>
26-
<button class="btn btn-sm btn-danger" data-toggle="modal" data-target="#delete" data-ng-click="touch(item)" title="{{'remove' | translate}}">
26+
<button class="btn btn-sm btn-danger" data-toggle="modal" data-target="#delete" ng-show="config.allowedActions.delete" data-ng-click="touch(item)" title="{{'remove' | translate}}">
2727
<i class="glyphicon glyphicon-trash"></i>
2828
</button>
2929
</div>

‎assets/templates/modals.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ <h4 class="modal-title">{{'compress' | translate}}</h4>
9292
<div class="label label-success error-msg">{{'compression_started' | translate}}</div>
9393
</div>
9494
<div ng-hide="temp.success">
95-
<div ng-hide="config.enableCompressChooseName">
95+
<div ng-hide="config.allowedActions.compress">
9696
{{'sure_to_start_compression_with' | translate}} <b>{{temp.model.name}}</b> ?
9797
</div>
98-
<div ng-show="config.enableCompressChooseName">
98+
<div ng-show="config.allowedActions.compress">
9999
<label class="radio">{{'enter_folder_name_for_compression' | translate}} <b>{{fileNavigator.currentPath.join('/')}}/{{temp.model.name}}</b></label>
100100
<input class="form-control" data-ng-model="temp.tempModel.name" autofocus="autofocus">
101101
</div>

0 commit comments

Comments
 (0)