codestyle

joomla · May 10, 2017 · 86328f9 · 86328f9
1 parent 6fb7c53
commit 86328f9
Show file tree

Hide file tree

Showing 54 changed files with 468 additions and 394 deletions.
diff --git a/installation/model/forms/database.xml b/installation/model/forms/database.xml
@@ -5,46 +5,50 @@
 			<field
 				name="db_type"
 				type="databaseconnection"
+				label="INSTL_DATABASE_TYPE_LABEL"
 				id="db_type"
 				class="inputbox"
-				label="INSTL_DATABASE_TYPE_LABEL"
 				supported="mysql,mysqli,pdomysql,postgresql,sqlsrv,sqlazure"
 				required="true"
 				default="mysqli"
 				filter="string"
 			/>
+
 			<field
 				name="db_host"
 				type="text"
+				label="INSTL_DATABASE_HOST_LABEL"
 				id="db_host"
 				class="inputbox"
-				label="INSTL_DATABASE_HOST_LABEL"
 				default="localhost"
 				required="true"
 			/>
+
 			<field
 				name="db_user"
 				type="text"
+				label="INSTL_DATABASE_USER_LABEL"
 				id="db_user"
 				class="inputbox"
-				label="INSTL_DATABASE_USER_LABEL"
 				required="true"
 			/>
+
 			<field
 				name="db_pass"
 				type="password"
+				label="INSTL_DATABASE_PASSWORD_LABEL"
 				id="db_pass"
 				class="inputbox"
-				label="INSTL_DATABASE_PASSWORD_LABEL"
 				autocomplete="off"
 				filter="raw"
 			/>
+
 			<field
 				name="db_name"
 				type="text"
+				label="INSTL_DATABASE_NAME_LABEL"
 				id="db_name"
 				class="inputbox"
-				label="INSTL_DATABASE_NAME_LABEL"
 				required="true"
 			/>
 		</fieldset>
@@ -54,21 +58,22 @@
 			<field
 				name="db_old"
 				type="radio"
+				label="INSTL_DATABASE_OLD_PROCESS_LABEL"
 				id="db_old"
 				class="btn-group"
-				label="INSTL_DATABASE_OLD_PROCESS_LABEL"
 				default="backup"
 				required="true"
-			>
+				>
 				<option value="backup">INSTL_DATABASE_FIELD_VALUE_BACKUP</option>
 				<option value="remove">INSTL_DATABASE_FIELD_VALUE_REMOVE</option>
 			</field>
+
 			<field
 				name="db_prefix"
 				type="installation.prefix"
+				label="INSTL_DATABASE_PREFIX_LABEL"
 				id="db_prefix"
 				class="inputbox"
-				label="INSTL_DATABASE_PREFIX_LABEL"
 				required="true"
 				validate="installation.prefix"
 				message="INSTL_DATABASE_PREFIX_MSG"

diff --git a/installation/model/forms/defaultlanguage.xml b/installation/model/forms/defaultlanguage.xml
@@ -4,36 +4,38 @@
 		<field
 			name="activateMultilanguage"
 			type="radio"
+			label="INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE"
 			id="activateMultilanguage"
 			class="btn-group"
-			label="INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE"
 			filter="integer"
 			default="0"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
+
 		<field
 			name="installLocalisedContent"
 			type="radio"
+			label="INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT"
 			id="installLocalisedContent"
 			class="btn-group"
-			label="INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT"
 			filter="integer"
 			default="1"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
+
 		<field
 			name="activatePluginLanguageCode"
 			type="radio"
+			label="INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN"
 			id="activatePluginLanguageCode"
 			class="btn-group"
-			label="INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN"
 			filter="integer"
 			default="0"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>

diff --git a/installation/model/forms/ftp.xml b/installation/model/forms/ftp.xml
@@ -5,37 +5,40 @@
 			<field
 				name="ftp_enable"
 				type="radio"
+				label="INSTL_FTP_ENABLE_LABEL"
 				id="ftp_enable"
 				class="btn-group"
-				label="INSTL_FTP_ENABLE_LABEL"
 				default="0"
 				filter="int"
 				required="true"
-			>
+				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
+
 			<field
 				name="ftp_user"
 				type="text"
+				label="INSTL_FTP_USER_LABEL"
 				id="ftp_user"
 				class="inputbox"
-				label="INSTL_FTP_USER_LABEL"
 			/>
+
 			<field
 				name="ftp_pass"
 				type="password"
+				label="INSTL_FTP_PASSWORD_LABEL"
 				id="ftp_pass"
 				class="inputbox"
-				label="INSTL_FTP_PASSWORD_LABEL"
 				filter="raw"
 			/>
+
 			<field
 				name="ftp_root"
 				type="text"
+				label="INSTL_FTP_ROOT_LABEL"
 				id="ftp_root"
 				class="inputbox"
-				label="INSTL_FTP_ROOT_LABEL"
 			/>
 		</fieldset>
 
@@ -44,30 +47,32 @@
 			<field
 				name="ftp_host"
 				type="text"
+				label="INSTL_FTP_HOST_LABEL"
 				id="ftp_host"
 				class="inputbox"
-				label="INSTL_FTP_HOST_LABEL"
 				default="127.0.0.1"
 			/>
+
 			<field
 				name="ftp_port"
 				type="text"
+				label="INSTL_FTP_PORT_LABEL"
 				id="ftp_port"
 				class="inputbox"
-				label="INSTL_FTP_PORT_LABEL"
 				default="21"
 				filter="int"
 			/>
+
 			<field
 				name="ftp_save"
 				type="radio"
+				label="INSTL_FTP_SAVE_LABEL"
 				id="ftp_save"
 				class="btn-group"
-				label="INSTL_FTP_SAVE_LABEL"
 				default="0"
 				required="true"
 				filter="int"
-			>
+				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>

diff --git a/installation/model/forms/preinstall.xml b/installation/model/forms/preinstall.xml
@@ -4,9 +4,9 @@
 		<field
 			name="language"
 			type="installation.language"
+			label="INSTL_LANGUAGE_LABEL"
 			id="language"
 			class="chzn-select-deselect"
-			label="INSTL_LANGUAGE_LABEL"
 			size="20"
 			default="en-GB"
 			required="true"

diff --git a/installation/model/forms/site.xml b/installation/model/forms/site.xml
@@ -4,9 +4,9 @@
 		<field
 			name="language"
 			type="installation.language"
+			label="INSTL_LANGUAGE_LABEL"
 			id="language"
 			class="chzn-select-deselect"
-			label="INSTL_LANGUAGE_LABEL"
 			size="20"
 			default="en-GB"
 			onchange="Install.setlanguage();"
@@ -15,37 +15,37 @@
 		<field
 			name="site_name"
 			type="text"
+			label="INSTL_SITE_NAME_LABEL"
 			id="site_name"
 			class="inputbox"
-			label="INSTL_SITE_NAME_LABEL"
 			required="true"
 		/>
 
 		<field
 			name="admin_email"
 			type="email"
+			label="INSTL_ADMIN_EMAIL_LABEL"
 			id="admin_email"
 			class="inputbox"
-			label="INSTL_ADMIN_EMAIL_LABEL"
 			validate="email"
 			required="true"
 		/>
 
 		<field
 			name="admin_user"
 			type="text"
+			label="INSTL_ADMIN_USER_LABEL"
 			id="admin_user"
 			class="inputbox"
-			label="INSTL_ADMIN_USER_LABEL"
 			required="true"
 		/>
 
 		<field
 			name="admin_password"
 			type="password"
+			label="INSTL_ADMIN_PASSWORD_LABEL"
 			id="admin_password"
 			class="inputbox"
-			label="INSTL_ADMIN_PASSWORD_LABEL"
 			required="true"
 			filter="raw"
 			autocomplete="off"
@@ -54,9 +54,9 @@
 		<field
 			name="admin_password2"
 			type="password"
+			label="INSTL_ADMIN_PASSWORD2_LABEL"
 			id="admin_password2"
 			class="inputbox"
-			label="INSTL_ADMIN_PASSWORD2_LABEL"
 			required="true"
 			filter="raw"
 			validate="equals"
@@ -67,21 +67,21 @@
 		<field
 			name="site_metadesc"
 			type="textarea"
+			label="INSTL_SITE_METADESC_LABEL"
 			id="site_metadesc"
 			class="text_area noResize"
-			label="INSTL_SITE_METADESC_LABEL"
 			rows="3"
 		/>
 
 		<field
 			name="site_offline"
 			type="radio"
+			label="INSTL_SITE_OFFLINE_LABEL"
 			id="site_offline"
 			class="btn-group"
 			default="0"
-			label="INSTL_SITE_OFFLINE_LABEL"
 			filter="integer"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>

diff --git a/installation/model/forms/summary.xml b/installation/model/forms/summary.xml
@@ -4,33 +4,36 @@
 		<field
 			name="summary_email"
 			type="radio"
+			label="INSTL_SUMMARY_EMAIL_LABEL"
 			id="summary_email"
 			class="btn-group"
 			default="0"
-			label="INSTL_SUMMARY_EMAIL_LABEL"
 			filter="integer"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
+
 		<field
 			name="summary_email_passwords"
 			type="radio"
+			label="INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL"
 			id="email_passwords"
 			class="btn-group"
 			default="0"
-			label="INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL"
 			filter="integer"
-		>
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
+
 		<field name="db_type" type="hidden" />
+
 		<field
 			name="sample_file"
 			type="installation.sample"
-			class="inputbox"
 			label="INSTL_SITE_INSTALL_SAMPLE_LABEL"
+			class="inputbox"
 		/>
 	</fieldset>
 </form>
diff --git a/modules/mod_articles_category/mod_articles_category.xml b/modules/mod_articles_category/mod_articles_category.xml
@@ -384,9 +384,9 @@
 				<field
 					name="show_date_field"
 					type="list"
-					default="created"
 					label="MOD_ARTICLES_CATEGORY_FIELD_DATEFIELD_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_DATEFIELD_DESC"
+					default="created"
 					>
 					<option value="created">MOD_ARTICLES_CATEGORY_OPTION_CREATED_VALUE</option>
 					<option value="modified">MOD_ARTICLES_CATEGORY_OPTION_MODIFIED_VALUE</option>
@@ -396,9 +396,9 @@
 				<field
 					name="show_date_format"
 					type="text"
-					default="Y-m-d H:i:s"
 					label="MOD_ARTICLES_CATEGORY_FIELD_DATEFIELDFORMAT_LABEL"
 					description="MOD_ARTICLES_CATEGORY_FIELD_DATEFIELDFORMAT_DESC"
+					default="Y-m-d H:i:s"
 				/>
 
 				<field

diff --git a/modules/mod_articles_news/mod_articles_news.xml b/modules/mod_articles_news/mod_articles_news.xml
@@ -94,7 +94,7 @@
 					description="MOD_ARTICLES_NEWS_FIELD_TRIGGEREVENTS_DESC"
 					class="btn-group btn-group-yesno"
 					default="1"
-				>
+					>
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
@@ -118,7 +118,7 @@
 					description="MOD_ARTICLES_NEWS_FIELD_SHOWINTROTEXT_DESC"
 					default="1"
 					class="btn-group btn-group-yesno"
-				>
+					>
 					<option value="1">JSHOW</option>
 					<option value="0">JHIDE</option>
 				</field>