- 
diff --git a/apps/ide/src/plugins/help/help-commands.js b/apps/ide/src/plugins/help/help-commands.js
index c84b0d0d..64bde249 100644
--- a/apps/ide/src/plugins/help/help-commands.js
+++ b/apps/ide/src/plugins/help/help-commands.js
@@ -44,14 +44,23 @@ define(['require'], function (require) {
}
function showAbout() {
- require(['text!./about.html',
- 'text!/package.json',
- 'dojo/i18n!./nls/resource',
- 'webida-lib/plugins/workbench/plugin',
- 'webida-lib/util/locale',
- 'webida-lib/widgets/dialogs/buttoned-dialog/ButtonedDialog'
- ],
- function (aboutHtml, text, i18n, workbench, Locale, ButtonedDialog) {
+ require([
+ 'text!./about.html',
+ 'text!/package.json',
+ 'dojo/i18n!./nls/resource',
+ 'webida-lib/plugins/workbench/plugin',
+ 'webida-lib/util/locale',
+ 'webida-lib/theme',
+ 'webida-lib/widgets/dialogs/buttoned-dialog/ButtonedDialog'
+ ], function (
+ aboutHtml,
+ text,
+ i18n,
+ workbench,
+ Locale,
+ theme,
+ ButtonedDialog
+ ) {
var localizer = new Locale(i18n);
var pane = new ButtonedDialog({
buttons: [],
@@ -81,7 +90,8 @@ define(['require'], function (require) {
commitId: data.buildcommitid || 'Unknown'
};
- pane.setContentArea(aboutHtml);
+
+ pane.setContentArea(theme.apply(aboutHtml));
$('#version').text(localizer.formatMessage('messageVersion', versionInfo));
$('#buildInfo').html(
diff --git a/apps/ide/src/plugins/webida.preference/plugin.json b/apps/ide/src/plugins/webida.preference/plugin.json
index 45fe01c1..f8ca0116 100644
--- a/apps/ide/src/plugins/webida.preference/plugin.json
+++ b/apps/ide/src/plugins/webida.preference/plugin.json
@@ -23,7 +23,7 @@
"keys" : { "default" : "Alt + P" }, "desc" : "Workspace Preferences"
},
"toolbar": {
- "icons" : "./styles/theme/webida-light/images/icons/toolbar_preference.png",
+ "icons" : "<%= themePath %>/images/icons/toolbar_preference.png",
"tooltip" : "Preferences",
"enabledOn": "toolbar.preferences.enable",
"disabledOn": "toolbar.preferences.disable"
diff --git a/common/src/webida/app-config.js b/common/src/webida/app-config.js
index ecfc166e..3496e081 100644
--- a/common/src/webida/app-config.js
+++ b/common/src/webida/app-config.js
@@ -57,6 +57,10 @@ define([
dir: '.project',
file: 'project.json'
}
+ },
+ theme: {
+ name: 'webida-light',
+ basePath: serverConf.systemApps[APP_ID].baseUrl + '/apps/ide/src/styles/theme/webida-light'
}
};
});
\ No newline at end of file
diff --git a/common/src/webida/plugins/workbench/command-system/toolbar.js b/common/src/webida/plugins/workbench/command-system/toolbar.js
index 5e788bd4..9de9d6e4 100644
--- a/common/src/webida/plugins/workbench/command-system/toolbar.js
+++ b/common/src/webida/plugins/workbench/command-system/toolbar.js
@@ -24,55 +24,57 @@
* toolbar.js
*/
-define(['webida-lib/plugin-manager-0.1', // pm
- 'external/lodash/lodash.min', // _
- './MenuItemTree', // MenuItemTree
- 'dojo', // dojo
- 'dojo/on', // on
- 'dojo/dom-style', // domStyle
- 'dojo/dom-class', // domClass
- 'dojo/dom-attr', // domAttr
- 'dojo/html', // html
- 'dojo/query', // query
- 'dojo/aspect', // aspect
- 'dojo/topic', // topic
- 'dojo/Deferred', // Deferred
- 'dojo/_base/lang', // lang
- 'dijit/Toolbar', // Toolbar
- 'dijit/form/Button', // Button
- 'dijit/form/DropDownButton', // DropDownButton
- 'dijit/form/ComboButton', // ComboButton
- 'dijit/Menu', // Menu
- 'dijit/DropDownMenu', // DropDownMenu
- 'dijit/MenuItem', // MenuItem
- 'dijit/MenuSeparator', // MenuSeparator
- 'dijit/ToolbarSeparator', // ToolbarSeparator
- ],
-function (pm,
- _,
- MenuItemTree,
- dojo,
- on,
- domStyle,
- domClass,
- domAttr,
- html,
- query,
- aspect,
- topic,
- Deferred,
- lang,
- Toolbar,
- Button,
- DropDownButton,
- ComboButton,
- Menu,
- DropDownMenu,
- MenuItem,
- MenuSeparator,
- ToolbarSeparator
- )
-{
+define([
+ 'external/lodash/lodash.min', // _
+ 'dojo', // dojo
+ 'dojo/on', // on
+ 'dojo/dom-style', // domStyle
+ 'dojo/dom-class', // domClass
+ 'dojo/dom-attr', // domAttr
+ 'dojo/html', // html
+ 'dojo/query', // query
+ 'dojo/aspect', // aspect
+ 'dojo/topic', // topic
+ 'dojo/Deferred', // Deferred
+ 'dojo/_base/lang', // lang
+ 'dijit/Toolbar', // Toolbar
+ 'dijit/form/Button', // Button
+ 'dijit/form/DropDownButton', // DropDownButton
+ 'dijit/form/ComboButton', // ComboButton
+ 'dijit/Menu', // Menu
+ 'dijit/DropDownMenu', // DropDownMenu
+ 'dijit/MenuItem', // MenuItem
+ 'dijit/MenuSeparator', // MenuSeparator
+ 'dijit/ToolbarSeparator', // ToolbarSeparator
+ 'webida-lib/plugin-manager-0.1', // pm
+ 'webida-lib/theme', // theme
+ './MenuItemTree' // MenuItemTree
+], function (
+ _,
+ dojo,
+ on,
+ domStyle,
+ domClass,
+ domAttr,
+ html,
+ query,
+ aspect,
+ topic,
+ Deferred,
+ lang,
+ Toolbar,
+ Button,
+ DropDownButton,
+ ComboButton,
+ Menu,
+ DropDownMenu,
+ MenuItem,
+ MenuSeparator,
+ ToolbarSeparator,
+ pm,
+ theme,
+ MenuItemTree
+) {
'use strict';
//console.log('mira: toolbar module loaded...');
@@ -101,7 +103,7 @@ function (pm,
var modifiedIconClass = menuitem.replace(/&/g, '').replace(/\//g, '__').replace(/ /g, '_') + '_wticons';
img = '';
imgClass = modifiedIconClass;
diff --git a/common/src/webida/theme.js b/common/src/webida/theme.js
new file mode 100644
index 00000000..e877089c
--- /dev/null
+++ b/common/src/webida/theme.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2012-2015 S-Core Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ *
+ * @since: 15. 11. 24
+ * @author: Koong Kyungmi (kyungmi.k@samsung.com)
+ */
+
+define([
+ 'external/lodash/lodash.min',
+ 'webida-lib/app-config'
+], function (
+ _,
+ config
+) {
+ 'use strict';
+ var theme = config.theme;
+
+ return {
+ apply: function (template) {
+ return _.template(template)({theme: theme.name, themePath: theme.basePath});
+ }
+ };
+});
\ No newline at end of file