ruhnet
/
monster-ui-storage
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

namespace change

couchdb
Ruel Tmeizeh - RuhNet 9 months ago
parent
1ecdd095a2
commit
e89cb76c51
16 changed files with 42 additions and 42 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +14
    -14
      app.js
  2. +1
    -1
      i18n/en-US.json
  3. +4
    -4
      style/app.css
  4. +1
    -1
      style/app.scss
  5. +1
    -1
      submodules/mts/i18n/en-US.json
  6. +1
    -1
      submodules/mts/mts.js
  7. +4
    -4
      submodules/mts/views/formElements.html
  8. +1
    -1
      submodules/mts/views/logo.html
  9. +1
    -1
      submodules/s3/i18n/en-US.json
  10. +1
    -1
      submodules/s3/s3.js
  11. +4
    -4
      submodules/s3/views/formElements.html
  12. +1
    -1
      submodules/s3/views/logo.html
  13. +1
    -1
      views/field-path.html
  14. +2
    -2
      views/item-settings.html
  15. +2
    -2
      views/layout.html
  16. +3
    -3
      views/new-item.html

+ 14
- 14
app.js View File

@ -15,7 +15,7 @@ define(function(require) {
}; };
// Autoload submodules // Autoload submodules
// (Submodules should be described in /apps/storagemgmt/storages.js)
// (Submodules should be described in /apps/storage/storages.js)
var storagesList = storagesConfig.storages; var storagesList = storagesConfig.storages;
var storagesPaths = []; var storagesPaths = [];
for (var i = 0, len = storagesList.length; i < len; i++) { for (var i = 0, len = storagesList.length; i < len; i++) {
@ -24,12 +24,12 @@ define(function(require) {
require(storagesPaths); require(storagesPaths);
var storageManager = { var storageManager = {
name: 'storagemgmt',
name: 'storage',
css: [ 'app' ], css: [ 'app' ],
requests: {}, requests: {},
subscribe: { subscribe: {
'storagemgmt.fetchStorages': 'define_storage_nodes' // For all submodules
'storage.fetchStorages': 'define_storage_nodes' // For all submodules
}, },
subModules: storagesList, subModules: storagesList,
@ -60,7 +60,7 @@ define(function(require) {
render: function(container) { render: function(container) {
var self = this; var self = this;
monster.pub('storagemgmt.fetchStorages', {
monster.pub('storage.fetchStorages', {
storages: self.storages, storages: self.storages,
callback: function (args) { callback: function (args) {
self.extendI18nOfSubmodule(args); self.extendI18nOfSubmodule(args);
@ -79,7 +79,7 @@ define(function(require) {
] ]
}); });
$(document.body).addClass('storagemgmt-app'); // class for styles;
$(document.body).addClass('storage-app'); // class for styles;
}, },
extendI18nOfSubmodule: function (args) { extendI18nOfSubmodule: function (args) {
@ -90,7 +90,7 @@ define(function(require) {
if (submoduleLanguages.length && submoduleLanguages.length > 0) { if (submoduleLanguages.length && submoduleLanguages.length > 0) {
if(submoduleLanguages.indexOf(curLanguage) > -1) { if(submoduleLanguages.indexOf(curLanguage) > -1) {
$.getJSON('/apps/storagemgmt/submodules/' + args.submoduleName + '/i18n/' + curLanguage + '.json').done(function (newDict) {
$.getJSON('/apps/storage/submodules/' + args.submoduleName + '/i18n/' + curLanguage + '.json').done(function (newDict) {
var dict = self.data.i18n[curLanguage]; var dict = self.data.i18n[curLanguage];
$.extend(true, dict, newDict); $.extend(true, dict, newDict);
}) })
@ -163,7 +163,7 @@ define(function(require) {
} }
}, },
error: function(error) { error: function(error) {
var errorMessage = self.i18n.active().storagemgmt.universalErrorMessageTemplate.replace('%api%', 'Storage');
var errorMessage = self.i18n.active().storage.universalErrorMessageTemplate.replace('%api%', 'Storage');
monster.ui.alert(errorMessage); monster.ui.alert(errorMessage);
log(error.status + ' - ' + error.error + ': ' + error.message + ' '); log(error.status + ' - ' + error.error + ': ' + error.message + ' ');
} }
@ -321,17 +321,17 @@ define(function(require) {
template.on('click', '.js-remove-storage', function(e) { template.on('click', '.js-remove-storage', function(e) {
e.preventDefault(); e.preventDefault();
var uuid = $(this).closest('.js-storage-item').data('uuid'); var uuid = $(this).closest('.js-storage-item').data('uuid');
monster.ui.confirm(self.i18n.active().storagemgmt.confirmDeleteText, function() {
monster.ui.confirm(self.i18n.active().storage.confirmDeleteText, function() {
self.storageManagerDeleteStorage(uuid, function() { self.storageManagerDeleteStorage(uuid, function() {
$('.js-storage-item[data-uuid="' + uuid + '"]').slideUp(400, function() { $('.js-storage-item[data-uuid="' + uuid + '"]').slideUp(400, function() {
$(this).remove(); $(this).remove();
}); });
self.storageManagerShowMessage(self.i18n.active().storagemgmt.successRemovingMessage);
self.storageManagerShowMessage(self.i18n.active().storage.successRemovingMessage);
}); });
}, undefined, { }, undefined, {
type: 'warning', type: 'warning',
title: self.i18n.active().storagemgmt.confirmDeleteTitle,
confirmButtonText: self.i18n.active().storagemgmt.confirmDelete
title: self.i18n.active().storage.confirmDeleteTitle,
confirmButtonText: self.i18n.active().storage.confirmDelete
}); });
}); });
@ -356,7 +356,7 @@ define(function(require) {
var isAlreadyActive = $(this).closest('.js-storage-item').hasClass('active-storage'); var isAlreadyActive = $(this).closest('.js-storage-item').hasClass('active-storage');
if(isAlreadyActive) { if(isAlreadyActive) {
self.storageManagerShowMessage(self.i18n.active().storagemgmt.alreadyActiveMessage, 'warning')
self.storageManagerShowMessage(self.i18n.active().storage.alreadyActiveMessage, 'warning')
} else { } else {
self.storageManagerSetDefaultStorage(uuid); self.storageManagerSetDefaultStorage(uuid);
} }
@ -414,7 +414,7 @@ define(function(require) {
self.storageManagerPatchStorage(storageData, function(){ self.storageManagerPatchStorage(storageData, function(){
var renderArgs = { var renderArgs = {
callback: function () { callback: function () {
self.storageManagerShowMessage(self.i18n.active().storagemgmt.successSavingMessage, 'success');
self.storageManagerShowMessage(self.i18n.active().storage.successSavingMessage, 'success');
} }
}; };
@ -528,7 +528,7 @@ define(function(require) {
self.storageManagerPatchStorage(storageData, function(data) { self.storageManagerPatchStorage(storageData, function(data) {
// update item name // update item name
$('.js-storage-item[data-uuid="' + uuid + '"]').find('.js-storage-name').text(storageName); $('.js-storage-item[data-uuid="' + uuid + '"]').find('.js-storage-name').text(storageName);
self.storageManagerShowMessage(self.i18n.active().storagemgmt.successUpdate, 'success');
self.storageManagerShowMessage(self.i18n.active().storage.successUpdate, 'success');
}); });
}); });


+ 1
- 1
i18n/en-US.json View File

@ -1,5 +1,5 @@
{ {
"storagemgmt": {
"storage": {
"title": "Storage Engine Management", "title": "Storage Engine Management",
"description": "The Storage Engine Management app allows you manage your storage", "description": "The Storage Engine Management app allows you manage your storage",
"universalErrorMessageTemplate": "Please contact your system administrator to configure %api% API, required for this application to work", "universalErrorMessageTemplate": "Please contact your system administrator to configure %api% API, required for this application to work",


+ 4
- 4
style/app.css View File

@ -1,20 +1,20 @@
.storagemgmt-app .storages-settings {
.storage-app .storages-settings {
display: block; display: block;
background: white; background: white;
padding: 13px 23px 2px; padding: 13px 23px 2px;
margin-bottom: 24px; margin-bottom: 24px;
border-radius: 8px; border-radius: 8px;
position: relative; } position: relative; }
.storagemgmt-app .storages-settings .close-btn {
.storage-app .storages-settings .close-btn {
width: 31px; width: 31px;
display: inline-block; display: inline-block;
text-align: center; text-align: center;
position: absolute; position: absolute;
top: 10px; top: 10px;
right: 10px; } right: 10px; }
.storagemgmt-app .storages-settings .close-btn i.fa {
.storage-app .storages-settings .close-btn i.fa {
font-size: 20px; } font-size: 20px; }
.storagemgmt-app .storages-settings .close-btn:hover i.fa {
.storage-app .storages-settings .close-btn:hover i.fa {
color: #22A5FF; } color: #22A5FF; }
.storage-manager-wrapper { .storage-manager-wrapper {


+ 1
- 1
style/app.scss View File

@ -1,4 +1,4 @@
.storagemgmt-app {
.storage-app {
.storages-settings { .storages-settings {
display: block; display: block;
background: white; background: white;


+ 1
- 1
submodules/mts/i18n/en-US.json View File

@ -1,5 +1,5 @@
{ {
"storagemgmt": {
"storage": {
"submodules": { "submodules": {
"mts": { "mts": {
"nameLabel": "Name", "nameLabel": "Name",


+ 1
- 1
submodules/mts/mts.js View File

@ -10,7 +10,7 @@ define(function(require){
requests: {}, requests: {},
subscribe: { subscribe: {
'storagemgmt.fetchStorages': 'defineStorageMTS'
'storage.fetchStorages': 'defineStorageMTS'
}, },
defineStorageMTS: function(args) { defineStorageMTS: function(args) {


+ 4
- 4
submodules/mts/views/formElements.html View File

@ -1,25 +1,25 @@
<input type="hidden" name="handler" value="s3"/> <input type="hidden" name="handler" value="s3"/>
<input type="hidden" name="settings.host" value="s3.cloud.mts.ru"/> <input type="hidden" name="settings.host" value="s3.cloud.mts.ru"/>
<label class="control-group"> <label class="control-group">
<span class="control-label">{{ @root.i18n.storagemgmt.submodules.s3.nameLabel }}</span>
<span class="control-label">{{ @root.i18n.storage.submodules.s3.nameLabel }}</span>
<div class="controls"> <div class="controls">
<input type="text" value="{{name}}" name="name"> <input type="text" value="{{name}}" name="name">
</div> </div>
</label> </label>
<label class="control-group"> <label class="control-group">
<span class="control-label">{{ @root.i18n.storagemgmt.submodules.s3.bucketLabel }}</span>
<span class="control-label">{{ @root.i18n.storage.submodules.s3.bucketLabel }}</span>
<div class="controls"> <div class="controls">
<input type="text" value="{{settings.bucket}}" name="settings.bucket"> <input type="text" value="{{settings.bucket}}" name="settings.bucket">
</div> </div>
</label> </label>
<label class="control-group"> <label class="control-group">
<span class="control-label">{{ @root.i18n.storagemgmt.submodules.s3.keyLabel }}</span>
<span class="control-label">{{ @root.i18n.storage.submodules.s3.keyLabel }}</span>
<div class="controls"> <div class="controls">
<input type="text" value="{{settings.key}}" name="settings.key"> <input type="text" value="{{settings.key}}" name="settings.key">
</div> </div>
</label> </label>
<label class="control-group"> <label class="control-group">
<span class="control-label">{{ @root.i18n.storagemgmt.submodules.s3.secretLabel }}</span>
<span class="control-label">{{ @root.i18n.storage.submodules.s3.secretLabel }}</span>
<div class="controls"> <div class="controls">
<input type="text" value="{{settings.secret}}" name="settings.secret"> <input type="text" value="{{settings.secret}}" name="settings.secret">
</div> </div>


+ 1
- 1
submodules/mts/views/logo.html View File

@ -1 +1 @@
<img src="/apps/storagemgmt/submodules/mts/img/logo.png" alt="mts" />
<img src="/apps/storage/submodules/mts/img/logo.png" alt="mts" />

+ 1
- 1
submodules/s3/i18n/en-US.json View File

@ -1,5 +1,5 @@
{ {
"storagemgmt": {
"storage": {
"submodules": { "submodules": {
"s3": { "s3": {
"nameLabel": "Name", "nameLabel": "Name",


+ 1
- 1
submodules/s3/s3.js View File

@ -10,7 +10,7 @@ define(function(require){
requests: {}, requests: {},
subscribe: { subscribe: {
'storagemgmt.fetchStorages': 'defineStorageS3'
'storage.fetchStorages': 'defineStorageS3'
}, },
defineStorageS3: function(args) { defineStorageS3: function(args) {


+ 4
- 4
submodules/s3/views/formElements.html View File

@ -1,24 +1,24 @@
<input type="hidden" name="handler" value="s3"/> <input type="hidden" name="handler" value="s3"/>
<label class="control-group"> <label class="control-group">
<span class="control-label">{{ @root.i18n.storagemgmt.submodules.s3.nameLabel }}</span>
<span class="control-label">{{ @root.i18n.storage.submodules.s3.nameLabel }}</span>
<div class="controls"> <div class="controls">
<input type="text" value="{{name}}" name="name"> <input type="text" value="{{name}}" name="name">
</div> </div>
</label> </label>
<label class="control-group"> <label class="control-group">
<span class="control-label">{{ @root.i18n.storagemgmt.submodules.s3.bucketLabel }}</span>
<span class="control-label">{{ @root.i18n.storage.submodules.s3.bucketLabel }}</span>
<div class="controls"> <div class="controls">
<input type="text" value="{{settings.bucket}}" name="settings.bucket"> <input type="text" value="{{settings.bucket}}" name="settings.bucket">
</div> </div>
</label> </label>
<label class="control-group"> <label class="control-group">
<span class="control-label">{{ @root.i18n.storagemgmt.submodules.s3.keyLabel }}</span>
<span class="control-label">{{ @root.i18n.storage.submodules.s3.keyLabel }}</span>
<div class="controls"> <div class="controls">
<input type="text" value="{{settings.key}}" name="settings.key"> <input type="text" value="{{settings.key}}" name="settings.key">
</div> </div>
</label> </label>
<label class="control-group"> <label class="control-group">
<span class="control-label">{{ @root.i18n.storagemgmt.submodules.s3.secretLabel }}</span>
<span class="control-label">{{ @root.i18n.storage.submodules.s3.secretLabel }}</span>
<div class="controls"> <div class="controls">
<input type="text" value="{{settings.secret}}" name="settings.secret"> <input type="text" value="{{settings.secret}}" name="settings.secret">
</div> </div>


+ 1
- 1
submodules/s3/views/logo.html View File

@ -1 +1 @@
<img src="/apps/storagemgmt/submodules/s3/img/logo.png" alt="s3" />
<img src="/apps/storage/submodules/s3/img/logo.png" alt="s3" />

+ 1
- 1
views/field-path.html View File

@ -1,5 +1,5 @@
<div class="path-wrapper"> <div class="path-wrapper">
<input class="input-small" type="text" id="path" placeholder="{{ i18n.storagemgmt.pathPlaceholder }}" value="{{path}}">
<input class="input-small" type="text" id="path" placeholder="{{ i18n.storage.pathPlaceholder }}" value="{{path}}">
<button class="save-path monster-button-fit monster-button-success">{{ i18n.save }}</button> <button class="save-path monster-button-fit monster-button-success">{{ i18n.save }}</button>
<a href="javascript:void(0);" class="monster-link cancel-link">{{ i18n.cancel }}</a> <a href="javascript:void(0);" class="monster-link cancel-link">{{ i18n.cancel }}</a>
</div> </div>

+ 2
- 2
views/item-settings.html View File

@ -5,10 +5,10 @@
{{{ formElements }}} {{{ formElements }}}
<div class="buttons-wrapper clearfix"> <div class="buttons-wrapper clearfix">
<button type="submit" class="btn btn-primary js-save" > <button type="submit" class="btn btn-primary js-save" >
{{ @root.i18n.storagemgmt.itemSettings.saveBtnText }}
{{ @root.i18n.storage.itemSettings.saveBtnText }}
</button> </button>
<button type="button" class="btn js-cancel"> <button type="button" class="btn js-cancel">
{{ @root.i18n.storagemgmt.itemSettings.cancelBtnText }}
{{ @root.i18n.storage.itemSettings.cancelBtnText }}
</button> </button>
</div> </div>
</form> </form>


+ 2
- 2
views/layout.html View File

@ -1,5 +1,5 @@
<div id="storage_manager_wrapper" class="storage-manager-wrapper"> <div id="storage_manager_wrapper" class="storage-manager-wrapper">
<h3>{{ @root.i18n.storagemgmt.settingsTitle }}</h3>
<h3>{{ @root.i18n.storage.settingsTitle }}</h3>
<div class="js-storage-items storage-items-list"> <div class="js-storage-items storage-items-list">
{{#compare storages.length ">" 0}} {{#compare storages.length ">" 0}}
{{#each storages}} {{#each storages}}
@ -26,7 +26,7 @@
<div class="buttons-wrapper"> <div class="buttons-wrapper">
<a href="" class="js-create-storage btn"> <a href="" class="js-create-storage btn">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
{{ @root.i18n.storagemgmt.newStorageBtnText }}
{{ @root.i18n.storage.newStorageBtnText }}
</a> </a>
</div> </div>
</div> </div>

+ 3
- 3
views/new-item.html View File

@ -18,17 +18,17 @@
<form class="form-horizontal js-storage-settings-form"> <form class="form-horizontal js-storage-settings-form">
{{{ formElements }}} {{{ formElements }}}
<label class="control-group"> <label class="control-group">
<span class="control-label">{{ @root.i18n.storagemgmt.itemSettings.setDefaultLabel }}</span>
<span class="control-label">{{ @root.i18n.storage.itemSettings.setDefaultLabel }}</span>
<div class="controls"> <div class="controls">
<input type="checkbox" checked="checked" value="" name="set_default" /> <input type="checkbox" checked="checked" value="" name="set_default" />
</div> </div>
</label> </label>
<div class="buttons-wrapper clearfix"> <div class="buttons-wrapper clearfix">
<button type="submit" class="btn btn-primary js-save" > <button type="submit" class="btn btn-primary js-save" >
{{ @root.i18n.storagemgmt.newItem.saveNewItemText }}
{{ @root.i18n.storage.newItem.saveNewItemText }}
</button> </button>
<button type="button" class="btn js-cancel"> <button type="button" class="btn js-cancel">
{{ @root.i18n.storagemgmt.newItem.cancelBtnText }}
{{ @root.i18n.storage.newItem.cancelBtnText }}
</button> </button>
</div> </div>
</form> </form>


Write Preview
Loading…
Cancel
Save