diff options
| -rw-r--r-- | pyload/web/app/index.html | 1 | ||||
| -rw-r--r-- | pyload/web/app/scripts/views/settings/configSectionView.js | 2 | ||||
| -rw-r--r-- | pyload/web/app/scripts/views/settings/settingsView.js | 6 | ||||
| -rw-r--r-- | pyload/web/app/styles/default/dashboard.less | 1 | ||||
| -rw-r--r-- | pyload/web/app/templates/default/settings/menu.html | 2 |
5 files changed, 5 insertions, 7 deletions
diff --git a/pyload/web/app/index.html b/pyload/web/app/index.html index e8e28f4e1..03e8535d7 100644 --- a/pyload/web/app/index.html +++ b/pyload/web/app/index.html @@ -24,7 +24,6 @@ function configValue(string, defaultValue) { if (string.indexOf('{{') > -1) return defaultValue; - return string; } diff --git a/pyload/web/app/scripts/views/settings/configSectionView.js b/pyload/web/app/scripts/views/settings/configSectionView.js index e05701b2a..0d9b0762f 100644 --- a/pyload/web/app/scripts/views/settings/configSectionView.js +++ b/pyload/web/app/scripts/views/settings/configSectionView.js @@ -77,7 +77,7 @@ define(['jquery', 'underscore', 'backbone', 'app', '../abstract/itemView', '../i var self = this; this.model.save({success: function() { self.render(); - App.settingsView.refresh(); + App.vent.trigger('config:change'); }}); }, diff --git a/pyload/web/app/scripts/views/settings/settingsView.js b/pyload/web/app/scripts/views/settings/settingsView.js index cad5ab075..ff86efdf9 100644 --- a/pyload/web/app/scripts/views/settings/settingsView.js +++ b/pyload/web/app/scripts/views/settings/settingsView.js @@ -11,7 +11,6 @@ define(['jquery', 'underscore', 'backbone', 'app', 'models/ConfigHolder', './con events: { 'click .settings-menu li > a': 'change_section', - 'click .btn-add': 'choosePlugin', // TODO not in scope 'click .icon-remove': 'deleteConfig' }, @@ -41,6 +40,7 @@ define(['jquery', 'underscore', 'backbone', 'app', 'models/ConfigHolder', './con }); this.listenTo(App.vent, 'config:open', this.openConfig); + this.listenTo(App.vent, 'config:change', this.refresh); this.refresh(); }, @@ -75,7 +75,7 @@ define(['jquery', 'underscore', 'backbone', 'app', 'models/ConfigHolder', './con addons.push(item); }); - this.ui.menu.html(this.templateMenu({ + this.$(this.ui.menu).html(this.templateMenu({ core: this.coreConfig, plugin: plugins, addon: addons @@ -177,7 +177,7 @@ define(['jquery', 'underscore', 'backbone', 'app', 'models/ConfigHolder', './con $.ajax(App.apiRequest('deleteConfig', {plugin: name}, { success: function() { self.refresh(); }})); - + return false; } }); diff --git a/pyload/web/app/styles/default/dashboard.less b/pyload/web/app/styles/default/dashboard.less index ab61ba29b..cd240f323 100644 --- a/pyload/web/app/styles/default/dashboard.less +++ b/pyload/web/app/styles/default/dashboard.less @@ -19,7 +19,6 @@ /* Packages */ - .package-list { list-style: none; margin-left: 0; diff --git a/pyload/web/app/templates/default/settings/menu.html b/pyload/web/app/templates/default/settings/menu.html index b560e9b83..893fd7b5b 100644 --- a/pyload/web/app/templates/default/settings/menu.html +++ b/pyload/web/app/templates/default/settings/menu.html @@ -32,7 +32,7 @@ <li class="nav-header"><i class="icon-th-list icon-white"></i> Plugin Configs</li> {{#each plugin }} <li class="plugin" data-name="{{ name }}"> - <a href="#" style="background-image: url({{ pluginIcon name }});"> + <a style="background-image: url({{ pluginIcon name }});"> {{ label }} <i class="icon-remove pull-right"></i> </a> |