BlueStork UI fixes, CSS cleanup, language fixes, new icons

git-svn-id: http://joomlacode.org/svn/joomla/development/trunk@16933 6f6e1ebd-4c2b-0410-823f-f34bde69bce9

administrator/components/com_modules/models/forms/module.xml

@@ -32,7 +32,7 @@
 			size="20"
 		/>
 
-		<field name="showtitle" type="list"
+		<field name="showtitle" type="radio"
 			default="1"
 			description="COM_MODULES_FIELD_SHOWTITLE_DESC"
 			label="COM_MODULES_FIELD_SHOWTITLE_LABEL"

administrator/components/com_modules/views/module/tmpl/edit.php

@@ -39,7 +39,7 @@ $hasContent = empty($this->item->module) || $this->item->module == 'custom' || $
 <form action="<?php JRoute::_('index.php?option=com_modules'); ?>" method="post" name="adminForm" id="module-form" class="form-validate">
 	<div class="width-60 fltlft">
 		<fieldset class="adminform">
-			<legend><?php echo JText::_('JOPTION_REQUIRED');?>	</legend>
+			<legend><?php echo JText::_('JDETAILS'); ?></legend>
 
 	<!-- Module metadata -->
 
@@ -57,19 +57,14 @@ $hasContent = empty($this->item->module) || $this->item->module == 'custom' || $
 
 			<?php echo $this->form->getLabel('access'); ?>
 			<?php echo $this->form->getInput('access'); ?>
-
-		</fieldset>
-		<fieldset class="adminform">
-			<legend><?php echo JText::_('JDETAILS'); ?></legend>
+			
 			<?php echo $this->form->getLabel('ordering'); ?>
+			
 			<div id="jform_ordering" class="fltlft"><?php echo $this->form->getInput('ordering'); ?></div>
 
 			<?php echo $this->form->getLabel('showtitle'); ?>
 			<?php echo $this->form->getInput('showtitle'); ?>
 
-			<?php echo $this->form->getLabel('note'); ?>
-			<?php echo $this->form->getInput('note'); ?>
-
 			<?php if ((string) $this->item->xml->name != 'Login Form'): ?>
 			<?php echo $this->form->getLabel('publish_up'); ?>
 			<?php echo $this->form->getInput('publish_up'); ?>
@@ -80,6 +75,9 @@ $hasContent = empty($this->item->module) || $this->item->module == 'custom' || $
 
 			<?php echo $this->form->getLabel('language'); ?>
 			<?php echo $this->form->getInput('language'); ?>
+			
+			<?php echo $this->form->getLabel('note'); ?>
+			<?php echo $this->form->getInput('note'); ?>
 
 			<?php if ($this->item->id) : ?>
 				<?php echo $this->form->getLabel('id'); ?>
@@ -94,18 +92,18 @@ $hasContent = empty($this->item->module) || $this->item->module == 'custom' || $
 			<?php echo $this->form->getLabel('client_id'); ?>
 			<input type="text" size="35" value="<?php echo $this->item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?>	" class="readonly" readonly="readonly" />
 
-			<br class="clr" />
-	<?php if ($this->item->xml) : ?>
+			<div class="clr" /></div>
+			<?php if ($this->item->xml) : ?>
 				<?php if ($text = trim($this->item->xml->description)) : ?>
 					<label>
 						<?php echo JText::_('COM_MODULES_MODULE_DESCRIPTION'); ?>
 					</label>
-					<?php echo JText::_($text); ?>
+					<span class="readonly mod-desc"><?php echo JText::_($text); ?></span>
 				<?php endif; ?>
 			<?php else : ?>
-				<?php echo JText::_('COM_MODULES_ERR_XML'); ?>
+				<p class="error"><?php echo JText::_('COM_MODULES_ERR_XML'); ?></p>
 			<?php endif; ?>
-			<br class="clr" />
+			<div class="clr" /></div>
 		</fieldset>
 	</div>
 
@@ -120,9 +118,7 @@ $hasContent = empty($this->item->module) || $this->item->module == 'custom' || $
 	</div>
 
 	<div class="width-60 fltlft">
-
 		<?php echo $this->loadTemplate('assignment'); ?>
-
 	</div>
 
 	<div class="clr"></div>

administrator/components/com_modules/views/module/tmpl/edit_assignment.php

@@ -27,12 +27,10 @@ $menuTypes = MenusHelper::getMenuLinks();
 
 				<label id="jform_menuselect-lbl" class="hasTip" for="jform_menuselect"><?php echo JText::_('COM_MODULES_MENU_SELECTION'); ?>:</label>
 
-				<div class="clr"></div>
-
-				<button type="button" class="button2" onclick="$$('.chk-menulink').each(function(el) { el.checked = !el.checked; });">
+				<button type="button" class="jform-rightbtn" onclick="$$('.chk-menulink').each(function(el) { el.checked = !el.checked; });">
 					<?php echo JText::_('COM_MODULES_MENU_SELECTION_INVERT'); ?>
 				</button>
-
+				<div class="clr"></div>
 				<div id="menu-assignment">
 
 				<?php foreach ($menuTypes as &$type) : ?>

administrator/components/com_templates/views/style/tmpl/edit.php

@@ -28,14 +28,13 @@ JHtml::_('behavior.formvalidation');
 <form action="<?php JRoute::_('index.php?option=com_templates'); ?>" method="post" name="adminForm" id="style-form" class="form-validate">
 	<div class="width-60 fltlft">
 		<fieldset class="adminform">
-			<legend><?php echo JText::_('JOPTION_REQUIRED');?>	</legend>
-
-
-			<?php echo $this->form->getLabel('template'); ?>
-			<?php echo $this->form->getInput('template'); ?>
-
+			<legend><?php echo JText::_('JDETAILS');?></legend>
+			
 			<?php echo $this->form->getLabel('title'); ?>
 			<?php echo $this->form->getInput('title'); ?>
+			
+			<?php echo $this->form->getLabel('template'); ?>
+			<?php echo $this->form->getInput('template'); ?>
 
 			<?php echo $this->form->getLabel('client_id'); ?>
 			<input type="text" size="35" value="<?php echo $this->item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?>	" class="readonly" readonly="readonly" />

administrator/language/en-GB/en-GB.com_modules.ini

@@ -14,7 +14,7 @@ COM_MODULES_ADVANCED_FIELDSET_LABEL="Advanced Options"
 COM_MODULES_ASSIGNED_VARIES_EXCEPT="Varies except"
 COM_MODULES_ASSIGNED_VARIES_ONLY="Varies only"
 
-COM_MODULES_HEADING_MODULE="Module"
+COM_MODULES_HEADING_MODULE="Module Type"
 COM_MODULES_HEADING_PAGES="Pages"
 COM_MODULES_HEADING_POSITION="Position"
 
@@ -54,7 +54,7 @@ COM_MODULES_OPTION_MENU_NONE="On no pages"
 COM_MODULES_OPTION_ORDER_POSITION="%d. %s"
 
 COM_MODULES_FIELD_MODULE_DESC="Module type"
-COM_MODULES_FIELD_MODULE_LABEL="Module"
+COM_MODULES_FIELD_MODULE_LABEL="Module Type"
 COM_MODULES_FIELD_POSITION_DESC="You may select a module position from the dropdown box of pre-defined positions or enter your own module position by clicking on the 'Select position', typing in the name and Save."
 COM_MODULES_FIELD_POSITION_LABEL="Position"
 COM_MODULES_FIELD_SHOWTITLE_DESC="Show/Hide module title on display. Effect will depend on the chrome style in the template."
@@ -62,8 +62,8 @@ COM_MODULES_FIELD_SHOWTITLE_LABEL="Show Title"
 COM_MODULES_FIELD_TITLE_DESC="Module must have a title"
 COM_MODULES_FIELD_NOTE_DESC="Note Desc"
 COM_MODULES_FIELD_NOTE_LABEL="Note"
-COM_MODULES_FIELD_CLIENT_ID_DESC="The type of the module, whether it is for the front-end or back-end. You cannot change this value for the module."
-COM_MODULES_FIELD_CLIENT_ID_LABEL="Type of Module"
+COM_MODULES_FIELD_CLIENT_ID_DESC="The location of the module, frontend or backend. You cannot change this value."
+COM_MODULES_FIELD_CLIENT_ID_LABEL="Module Location"
 
 COM_MODULES_FIELD_CACHING_DESC="Select whether to cache the content of this module"
 COM_MODULES_FIELD_CACHING_LABEL="Caching"

administrator/language/en-GB/en-GB.com_modules.sys.ini

@@ -4,6 +4,6 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
-COM_MODULES="Modules Manager"
-COM_MODULES_XML_DESCRIPTION="Componet for module managment in backend"
+COM_MODULES="Module Manager"
+COM_MODULES_XML_DESCRIPTION="Component for module management on the backend."
 

administrator/language/en-GB/en-GB.com_templates.ini

@@ -18,7 +18,7 @@ COM_TEMPLATES_HEADING_ASSIGNED="Assigned"
 COM_TEMPLATES_HEADING_DEFAULT="Default"
 COM_TEMPLATES_HEADING_STYLE="Style"
 COM_TEMPLATES_HEADING_TEMPLATE="Template"
-COM_TEMPLATES_HEADING_TYPE="Type"
+COM_TEMPLATES_HEADING_TYPE="Location"
 COM_TEMPLATES_MANAGER_STYLES="Template Manager: Styles"
 COM_TEMPLATES_MANAGER_TEMPLATES="Template Manager: Templates"
 COM_TEMPLATES_MANAGER="Template Manager"
@@ -37,7 +37,7 @@ COM_TEMPLATES="Templates Manager"
 COM_TEMPLATES_BASIC_FIELDSET_LABEL="Basic Options"
 COM_TEMPLATES_ADVANCED_FIELDSET_LABEL="Advanced Options"
 COM_TEMPLATES_FIELD_CLIENT_DESC="Whether this template is used for the front-end (0) or the back-end (1)"
-COM_TEMPLATES_FIELD_CLIENT_LABEL="Client"
+COM_TEMPLATES_FIELD_CLIENT_LABEL="Location"
 COM_TEMPLATES_FIELD_HOME_DESC="This template is defined or not as default template"
 COM_TEMPLATES_FIELD_HOME_LABEL="Default"
 COM_TEMPLATES_FIELD_TEMPLATE_DESC="Template Name"

administrator/templates/bluestork/css/template.css

@@ -33,7 +33,7 @@ body {
 }
 
 body,td,th {
-	font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
+	font-family: Arial, Helvetica, sans-serif;
 }
 
 html,body {
@@ -898,13 +898,25 @@ input#jform_extension {
 }
 
 input.readonly {
-	font-size: 1em;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 1.091em;;
 	padding-top: 1px;
 	border: 0;
 	font-weight: bold;
-	background-color: #F7F7F7;
+	color: #666;
 }
 
+#jform_id,
+span.readonly {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 1.091em;;
+	margin:5px 5px 5px 0;
+	font-weight: bold;
+	display:block;
+	color: #666;
+}
+.mod-desc { margin-left: 140px !important;}
+
 input.required {
 	background-color: #d5eeff;
 }
@@ -918,6 +930,19 @@ input.readonly {
 	background-color: #ffffff;
 }
 
+#jform_params_width,
+#jform_params_height,
+#jform_params_increase,
+#jform_params_shownumber,
+#jform_params_count {
+	width: 50px;
+}
+
+#jform_id { 
+	width: 50px;
+	background-color:#FFFFFF;
+	border: 0 none;
+}
 
 input#jform_title,
 input#jform_leveltitle,
@@ -986,13 +1011,16 @@ fieldset.adminform.long label {
 
 fieldset.adminform.long input {
 
-
 }
 
+
+	
 div#menu-assignment {
 	height: 300px;
 	overflow: auto;
 	clear:left;
+	border: 1px solid #CCCCCC;
+	padding: 0 17px;
 }
 div#menu-assignment input,
 div#menu-assignment h3 {
@@ -1001,11 +1029,13 @@ div#menu-assignment h3 {
 	margin-bottom: 0;
 }
 div#menu-assignment h3 {
-	padding-top: 15px;
 	border-bottom: 1px solid #CCCCCC;
 	width: 90%;
 }
 
+button.jform-rightbtn {float:right;margin-right: 0;}
+	
+	
 /* Field label widths- short label */
 fieldset.adminform label {
 	clear: left;