From 0daf121703f0a2c362548062d46e9929964b182f Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 15 Jul 2015 12:27:58 +0200
Subject: [PATCH] Export as package now requires a set packageName

---
 .../install/files/acp/templates/styleAdd.tpl  |  4 +-
 .../files/acp/templates/styleExport.tpl       | 61 +++++--------------
 2 files changed, 18 insertions(+), 47 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl
index cc85a392a5..3ab155d864 100644
--- a/wcfsetup/install/files/acp/templates/styleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl
@@ -77,7 +77,9 @@
 		
 		{* general *}
 		<div id="general" class="container containerPadding tabMenuContent">
-			<fieldset>
+			<p class="info">{lang}wcf.acp.style.protected{/lang}</p>
+			
+			<fieldset class="marginTop">
 				<legend>{lang}wcf.acp.style.general.data{/lang}</legend>
 				
 				<dl{if $errorField == 'styleName'} class="formError"{/if}>
diff --git a/wcfsetup/install/files/acp/templates/styleExport.tpl b/wcfsetup/install/files/acp/templates/styleExport.tpl
index e34fd66634..b6b7fd4235 100644
--- a/wcfsetup/install/files/acp/templates/styleExport.tpl
+++ b/wcfsetup/install/files/acp/templates/styleExport.tpl
@@ -1,20 +1,5 @@
 {include file='header' pageTitle='wcf.acp.style.exportStyle'}
 
-<script data-relocate="true">
-	//<![CDATA[
-	$(function() {
-		$('#exportAsPackage').change(function (event) {
-			if ($('#exportAsPackage').is(':checked')) {
-				$('#packageNameDl').show();
-			}
-			else {
-				$('#packageNameDl').hide();
-			}
-		}).trigger('change');
-	});
-	//]]>
-</script>
-
 <header class="boxHeadline">
 	<h1>{lang}wcf.acp.style.exportStyle{/lang}</h1>
 </header>
@@ -53,37 +38,21 @@
 			{event name='componentFields'}
 		</fieldset>
 		
-		<fieldset>
-			<legend>{lang}wcf.acp.style.exportStyle.asPackage{/lang}</legend>
-			<small>{lang}wcf.acp.style.exportStyle.asPackage.description{/lang}</small>
-			
-			<dl>
-				<dt></dt>
-				<dd>
-					<label><input type="checkbox" id="exportAsPackage" name="exportAsPackage" value="1"{if $exportAsPackage} checked="checked"{/if} /> <span>{lang}wcf.acp.style.exportAsPackage{/lang}</span></label>
-				</dd>
-			</dl>
-			<dl id="packageNameDl"{if $errorField == 'packageName'} class="formError"{/if}>
-				<dt>
-					<label for="packageName">{lang}wcf.acp.style.packageName{/lang}</label>
-				</dt>
-				<dd>
-					<input type="text" name="packageName" id="packageName" class="long" value="{$packageName}" />
-					{if $errorField == 'packageName'}
-						<small class="innerError">
-							{if $errorType == 'empty'}
-								{lang}wcf.global.form.error.empty{/lang}
-							{else}
-								{lang}wcf.acp.style.packageName.error.{$errorType}{/lang}
-							{/if}
-						</small>
-					{/if}
-					<small>{lang}wcf.acp.style.packageName.description{/lang}</small>
-				</dd>
-			</dl>
-			
-			{event name='exportAsPackageFields'}
-		</fieldset>
+		{if $style->packageName}
+			<fieldset>
+				<legend>{lang}wcf.acp.style.exportStyle.asPackage{/lang}</legend>
+				<small>{lang}wcf.acp.style.exportStyle.asPackage.description{/lang}</small>
+				
+				<dl>
+					<dt></dt>
+					<dd>
+						<label><input type="checkbox" id="exportAsPackage" name="exportAsPackage" value="1"{if $exportAsPackage} checked="checked"{/if} /> <span>{lang}wcf.acp.style.exportAsPackage{/lang}</span></label>
+					</dd>
+				</dl>
+				
+				{event name='exportAsPackageFields'}
+			</fieldset>
+		{/if}
 		
 		{event name='fieldsets'}
 	</div>
-- 
2.20.1