Merge pull request #118 from chmst/Move_field_condition

Move field condition, improve UX
bembelimen · Sep 10, 2017 · 8edc355 · 8edc355
2 parents 05cdd51 + 9fc24fc
commit 8edc355
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/administrator/components/com_workflow/models/forms/state.xml b/administrator/components/com_workflow/models/forms/state.xml
@@ -35,7 +35,6 @@
 				type="list"
 				label="COM_WORKFLOW_CONDITION"
 				class="input-xxlarge input-large-text"
-		        required="true"
 		>
 			<option value="1">COM_WORKFLOW_PUBLISHED</option>
 			<option value="0">COM_WORKFLOW_UNPUBLISHED</option>

diff --git a/administrator/components/com_workflow/tmpl/state/edit.php b/administrator/components/com_workflow/tmpl/state/edit.php
@@ -31,6 +31,7 @@
 	<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'details', JText::_('COM_WORKFLOW_DESCRIPTION')); ?>
 	<div class="row">
 		<div class="col-md-9">
+			<?php echo $this->form->renderField('condition'); ?>
 			<?php echo $this->form->getInput('description'); ?>
 		</div>
 		<div class="col-md-3">
@@ -45,14 +46,6 @@
 								<?php echo $this->form->getInput('published'); ?>
 							</div>
 						</div>
-						<div class="control-group">
-							<div class="control-label">
-								<?php echo $this->form->getLabel('condition'); ?>
-							</div>
-							<div class="controls">
-								<?php echo $this->form->getInput('condition'); ?>
-							</div>
-						</div>
 						<div class="control-group">
 							<div class="control-label">
 								<?php echo $this->form->getLabel('default'); ?>

diff --git a/administrator/language/en-GB/en-GB.com_workflow.ini b/administrator/language/en-GB/en-GB.com_workflow.ini
@@ -8,7 +8,7 @@ COM_WORKFLOW_ARE_YOU_SURE="Are you sure ?"
 COM_WORKFLOW_ASC_CONDITION="Condition ascending"
 COM_WORKFLOW_AUTHOR="Author"
 COM_WORKFLOW_BASIC_TAB="Basic"
-COM_WORKFLOW_CONDITION="Condtion"
+COM_WORKFLOW_CONDITION="Condition of items in this state: "
 COM_WORKFLOW_CONDITION_DESC="This means how assigned item to this state should behavior"
 COM_WORKFLOW_CONFIGURATION="Workflow: Options"
 COM_WORKFLOW_COUNT_STATES="States"