Merge pull request #4059 from pichalite/master

Modify ACP Skins page to use the word "Skin" instead of "Theme"

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');
 	}

src/views/admin/appearance/skins.tpl

@@ -1,6 +1,6 @@
 <div id="skins" class="row skins">
 	<div class="directory row" id="bootstrap_themes">
-		<i class="fa fa-refresh fa-spin"></i> Loading Themes
+		<i class="fa fa-refresh fa-spin"></i> Loading Skins
 	</div>
 
 	<div data-type="bootswatch" data-theme="" data-css="">
@@ -8,4 +8,4 @@
 			<i class="material-icons">undo</i>
 		</button>
 	</div>
-</div>
+</div>

src/views/admin/partials/theme_list.tpl

@@ -16,9 +16,9 @@
 		</div>
 		<div class="mdl-card__actions mdl-card--border">
 			<a class="mdl-button mdl-button--colored mdl-js-button mdl-js-ripple-effect" data-action="use">
-				Select Theme
+				<!-- IF themes.skin -->Select Skin<!-- ELSE -->Select Theme<!-- ENDIF themes.skin -->
 			</a>
 		</div>
 	</div>
 </div>
-<!-- END themes -->
+<!-- END themes -->