From deda23c70883216d59fff90f79c501334c620976 Mon Sep 17 00:00:00 2001 From: pichalite Date: Thu, 14 Jan 2016 14:26:39 -0800 Subject: [PATCH 1/3] Use Skins instead of Themes --- src/views/admin/appearance/skins.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/admin/appearance/skins.tpl b/src/views/admin/appearance/skins.tpl index ce145eec79..0c1b543a47 100644 --- a/src/views/admin/appearance/skins.tpl +++ b/src/views/admin/appearance/skins.tpl @@ -1,6 +1,6 @@
- Loading Themes + Loading Skins
@@ -8,4 +8,4 @@ undo
-
\ No newline at end of file + From 5d38b8d68750d94b48a4399bb70a15990a7dc6e0 Mon Sep 17 00:00:00 2001 From: pichalite Date: Thu, 14 Jan 2016 14:27:05 -0800 Subject: [PATCH 2/3] display "Select Skin" for skins --- src/views/admin/partials/theme_list.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/admin/partials/theme_list.tpl b/src/views/admin/partials/theme_list.tpl index c6ff1da5d0..1517eb5c9e 100644 --- a/src/views/admin/partials/theme_list.tpl +++ b/src/views/admin/partials/theme_list.tpl @@ -16,9 +16,9 @@ - \ No newline at end of file + From 90210350f99fc9c686b627228c1596c1d13f1b33 Mon Sep 17 00:00:00 2001 From: pichalite Date: Thu, 14 Jan 2016 14:28:04 -0800 Subject: [PATCH 3/3] Use Skin instead of Theme --- public/src/admin/appearance/skins.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/public/src/admin/appearance/skins.js b/public/src/admin/appearance/skins.js index 895b97de52..4d0d8ffc04 100644 --- a/public/src/admin/appearance/skins.js +++ b/public/src/admin/appearance/skins.js @@ -61,7 +61,8 @@ define('admin/appearance/skins', function() { description: theme.description, screenshot_url: theme.thumbnail, url: theme.preview, - css: theme.cssCdn + css: theme.cssCdn, + skin: true }; }), showRevert: true @@ -84,7 +85,7 @@ define('admin/appearance/skins', function() { .find('[data-action="use"]').each(function() { if ($(this).parents('[data-theme]').attr('data-theme')) { $(this) - .html('Select Theme') + .html('Select Skin') .removeClass('btn-success') .addClass('btn-primary'); } @@ -97,7 +98,7 @@ define('admin/appearance/skins', function() { $('[data-theme="' + themeId + '"]') .addClass('selected') .find('[data-action="use"]') - .html('Current Theme') + .html('Current Skin') .removeClass('btn-primary') .addClass('btn-success'); }