From 45d9e25135983a1558e99cb9d4645560d6b07ff1 Mon Sep 17 00:00:00 2001
From: luis-toptal <luis.martinez@toptal.com>
Date: Sat, 23 Nov 2024 13:22:31 +0700
Subject: [PATCH 01/11] feat: file admin form fills more space

---
 less/modules/buttons.less           |  8 +++
 less/modules/forms.less             |  4 ++
 protected/views/adminFile/_form.php | 81 +++++++++++++++++++++--------
 3 files changed, 70 insertions(+), 23 deletions(-)

diff --git a/less/modules/buttons.less b/less/modules/buttons.less
index 036f828bd0..b16c7641f0 100644
--- a/less/modules/buttons.less
+++ b/less/modules/buttons.less
@@ -42,6 +42,14 @@
   }
 }
 
+.btn-min-width {
+  min-width: 120px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+
 .danger-btn {
   color: @color-true-white;
   background-color: @color-brand-danger-650;
diff --git a/less/modules/forms.less b/less/modules/forms.less
index ba55ce8ef0..80db4b11d9 100644
--- a/less/modules/forms.less
+++ b/less/modules/forms.less
@@ -30,6 +30,10 @@ input:not([type="submit"]):not([type="button"]), select, textarea, .form-control
   }
 }
 
+textarea.form-control {
+  resize: vertical;
+}
+
 // Base checkbox styles
 input[type="checkbox"] {
   width: auto;
diff --git a/protected/views/adminFile/_form.php b/protected/views/adminFile/_form.php
index 6d170aefac..c25c1af51c 100644
--- a/protected/views/adminFile/_form.php
+++ b/protected/views/adminFile/_form.php
@@ -1,15 +1,18 @@
-<div class="section form row">
+<div class="section form">
 
-    <div class="col-md-offset-3 col-md-6">
+    <div>
         <?php $form = $this->beginWidget('CActiveForm', array(
             'id' => 'file-form',
             'enableAjaxValidation' => false,
+            'htmlOptions' => [
+                'class' => 'row'
+            ]
         )); ?>
 
-        <p class="note">Fields with <span class="required">*</span> are required.</p>
+        <p class="note col-md-12">Fields with <span class="required">*</span> are required.</p>
 
         <?php if ($model->hasErrors()) : ?>
-            <div class="alert alert-danger">
+            <div class="alert alert-danger col-md-12">
                 <?php echo $form->errorSummary($model); ?>
             </div>
         <?php endif; ?>
@@ -25,6 +28,9 @@
                 'valueField' => 'id',
                 'textField' => 'identifier',
             ],
+            'groupOptions' => [
+                'class' => 'col-md-6'
+            ],
             'inputOptions' => [
                 'required' => true,
             ],
@@ -34,6 +40,9 @@
             'form' => $form,
             'model' => $model,
             'attributeName' => 'name',
+            'groupOptions' => [
+                'class' => 'col-md-6'
+            ],
             'inputOptions' => [
                 'required' => true,
                 'maxlength' => 100
@@ -44,6 +53,9 @@
             'form' => $form,
             'model' => $model,
             'attributeName' => 'location',
+            'groupOptions' => [
+                'class' => 'col-md-12'
+            ],
             'inputOptions' => [
                 'required' => true,
                 'maxlength' => 200
@@ -54,6 +66,9 @@
             'form' => $form,
             'model' => $model,
             'attributeName' => 'extension',
+            'groupOptions' => [
+                'class' => 'col-md-4'
+            ],
             'inputOptions' => [
                 'required' => true,
                 'maxlength' => 30
@@ -64,31 +79,43 @@
             'form' => $form,
             'model' => $model,
             'attributeName' => 'size',
+            'groupOptions' => [
+                'class' => 'col-md-4'
+            ],
             'inputOptions' => [
                 'required' => true,
             ],
             'tooltip' => 'The size of file on disk in bytes'
         ]);
+        $this->widget('application.components.controls.DateField', [
+            'form' => $form,
+            'model' => $model,
+            'attributeName' => 'date_stamp',
+            'groupOptions' => [
+                'class' => 'col-md-4'
+            ],
+            'tooltip' => 'The date the file is made publicly available, usually the same as the dataset release date. Format: yyyy-mm-dd'
+        ]);
         $this->widget('application.components.controls.TextArea', [
             'form' => $form,
             'model' => $model,
             'attributeName' => 'description',
+            'groupOptions' => [
+                'class' => 'col-md-12'
+            ],
             'inputOptions' => [
                 'rows' => 6,
                 'cols' => 50
             ],
             'tooltip' => 'The description of the files content'
         ]);
-        $this->widget('application.components.controls.DateField', [
-            'form' => $form,
-            'model' => $model,
-            'attributeName' => 'date_stamp',
-            'tooltip' => 'The date the file is made publicly available, usually the same as the dataset release date. Format: yyyy-mm-dd'
-        ]);
         $this->widget('application.components.controls.DropdownField', [
             'form' => $form,
             'model' => $model,
             'attributeName' => 'format_id',
+            'groupOptions' => [
+                'class' => 'col-md-6'
+            ],
             'listDataOptions' => [
                 'data' => FileFormat::model()->findAll(),
                 'valueField' => 'id',
@@ -100,6 +127,9 @@
             'form' => $form,
             'model' => $model,
             'attributeName' => 'type_id',
+            'groupOptions' => [
+                'class' => 'col-md-6'
+            ],
             'listDataOptions' => [
                 'data' => FileType::model()->findAll(),
                 'valueField' => 'id',
@@ -111,33 +141,36 @@
             'form' => $form,
             'model' => $model,
             'attributeName' => 'sample_name',
+            'groupOptions' => [
+                'class' => 'col-md-12'
+            ],
             'tooltip' => 'If the file is directly and solely related to a single Sample entity named in GigaDB, a link to that sample can be added here by entering the exact name of the sample'
         ]);
         ?>
 
         <?php if (!$model->isNewRecord) { ?>
-            <div class="control-group">
+            <div class="control-group col-md-12">
             <?php if ($model->fileAttributes) { ?>
                     <table class="table table-attr">
                         <caption>Attributes</caption>
                         <thead>
                             <tr>
-                                <th>Attribute Name</th>
-                                <th>Value</th>
-                                <th>Unit</th>
-                                <th>Actions</th>
+                                <th style="width: 25%">Attribute Name</th>
+                                <th style="width: 40%">Value</th>
+                                <th style="width: 15%">Unit</th>
+                                <th style="width: 20%">Actions</th>
                             </tr>
                         </thead>
                         <tbody>
                             <?php foreach ($model->fileAttributes as $fa) { ?>
                                 <tr class="row-edit-<?= $fa->id ?>">
-                                    <td>
+                                    <td class="text-nowrap">
                                         <?= $fa->attribute->attribute_name ?>
                                     </td>
                                     <td>
                                         <?= $fa->value ?>
                                     </td>
-                                    <td>
+                                    <td class="text-nowrap">
                                         <?= $fa->unit ? $fa->unit->name : '' ?>
                                     </td>
                                     <td>
@@ -155,7 +188,7 @@
                 <button type="button" class="btn background-btn-o js-btn-attr" aria-expanded="false" aria-controls="newAttrForm" data-test="new-attr-btn" data-toggle="tooltip" title="Show and/or Add file attributes"><span class="js-btn-attr-label">Show New Attribute Fields</span> <i class="fa fa-caret-down js-caret-type" aria-hidden="true"></i></button>
                 <br />
                 <fieldset id="newAttrForm" class="js-new-attr mt-10 mb-20 row" aria-label="New attribute fields" style="display:none;">
-                    <div class="col-xs-5">
+                    <div class="col-md-4">
                         <?php
                         $this->widget('application.components.controls.DropdownField', [
                             'form' => $form,
@@ -177,7 +210,7 @@
                         ]);
                         ?>
                     </div>
-                    <div class="col-xs-3">
+                    <div class="col-md-4">
                         <?php
                         $this->widget('application.components.controls.TextField', [
                             'form' => $form,
@@ -194,7 +227,7 @@
                         ]);
                         ?>
                     </div>
-                    <div class="col-xs-4">
+                    <div class="col-md-4">
                         <?php
                         $this->widget('application.components.controls.DropdownField', [
                             'form' => $form,
@@ -225,9 +258,11 @@
                 </fieldset>
             </div>
         <?php } ?>
-        <div class="pull-right btns-row">
-            <a href="/adminFile/admin" class="btn background-btn-o">Cancel</a>
-            <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
+        <div class="col-md-12">
+            <div class="pull-right btns-row">
+                <a href="/adminFile/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+                <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
+            </div>
         </div>
 
         <?php $this->endWidget(); ?>

From 6945bc1c6c6f95a5df24568547850af5fb20afa2 Mon Sep 17 00:00:00 2001
From: luis-toptal <luis.martinez@toptal.com>
Date: Sat, 23 Nov 2024 13:35:22 +0700
Subject: [PATCH 02/11] feat: updates admin sample form

---
 protected/views/adminSample/_form.php | 45 ++++++++++++++++++---------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/protected/views/adminSample/_form.php b/protected/views/adminSample/_form.php
index 0f608b9660..7da3e12146 100644
--- a/protected/views/adminSample/_form.php
+++ b/protected/views/adminSample/_form.php
@@ -1,11 +1,13 @@
-<div class="section form row">
-
-    <div class="col-md-offset-3 col-md-6">
-        <?php $form = $this->beginWidget('CActiveForm', array(
-            'id' => 'sample-form',
-            'enableAjaxValidation' => false,
-        )); ?>
+<div class="section form">
+    <?php $form = $this->beginWidget('CActiveForm', array(
+        'id' => 'sample-form',
+        'enableAjaxValidation' => false,
+        'htmlOptions' => [
+            'class' => 'row'
+        ]
+    )); ?>
 
+    <div class="col-md-12">
         <p class="note">Fields with <span class="required">*</span> are required.</p>
 
         <?php if ($model->hasErrors()) : ?>
@@ -13,7 +15,9 @@
                 <?php echo $form->errorSummary($model); ?>
             </div>
         <?php endif; ?>
+    </div>
 
+    <div class="col-md-6">
         <div class="form-group">
             <?php echo $form->labelEx($model, 'species_id', array('class' => 'control-label')); ?>
             <?php
@@ -44,31 +48,42 @@
                 <?php echo $form->error($model, 'species_id'); ?>
             </div>
         </div>
+    </div>
 
+    <div class="col-md-6">
         <?php
-        $model->attributesList = $model->attributesList ? $model->attributesList :  $model->getAttributesList(true); // this sets the default text content of the textarea
-        $this->widget('application.components.controls.TextArea', [
+        $this->widget('application.components.controls.TextField', [
             'form' => $form,
             'model' => $model,
-            'attributeName' => 'attributesList',
+            'attributeName' => 'name',
+            'inputOptions' => [
+                'maxlength' => 50
+            ],
         ]);
+        ?>
+    </div>
 
-        $this->widget('application.components.controls.TextField', [
+    <div class="col-md-12">
+        <?php
+        $model->attributesList = $model->attributesList ? $model->attributesList :  $model->getAttributesList(true);
+        $this->widget('application.components.controls.TextArea', [
             'form' => $form,
             'model' => $model,
-            'attributeName' => 'name',
+            'attributeName' => 'attributesList',
             'inputOptions' => [
-                'maxlength' => 50
+                'rows' => 6,
+                'cols' => 50
             ],
         ]);
         ?>
+    </div>
 
+    <div class="col-md-12">
         <div class="pull-right btns-row">
             <a href="/adminSample/admin" class="btn background-btn-o">Cancel</a>
             <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
         </div>
-
-        <?php $this->endWidget(); ?>
     </div>
 
+    <?php $this->endWidget(); ?>
 </div>
\ No newline at end of file

From 2cea6567ac745bd562e5d999800b56c3b5b6cf86 Mon Sep 17 00:00:00 2001
From: luis-toptal <luis.martinez@toptal.com>
Date: Sat, 23 Nov 2024 13:44:27 +0700
Subject: [PATCH 03/11] feat: update admin author and admin sample forms

---
 protected/views/adminAuthor/_form.php | 134 +++++++++++++---------
 protected/views/adminSample/_form.php | 154 +++++++++++++-------------
 2 files changed, 157 insertions(+), 131 deletions(-)

diff --git a/protected/views/adminAuthor/_form.php b/protected/views/adminAuthor/_form.php
index 8cd304bf3e..8ac85cf20a 100644
--- a/protected/views/adminAuthor/_form.php
+++ b/protected/views/adminAuthor/_form.php
@@ -1,18 +1,19 @@
-<div class="section form row">
+<div class="section form">
+	<?php $form = $this->beginWidget('CActiveForm', array(
+		'id' => 'author-form',
+		'enableAjaxValidation' => false,
+	)); ?>
 
-	<div class="col-md-offset-3 col-md-6">
-		<?php $form = $this->beginWidget('CActiveForm', array(
-			'id' => 'author-form',
-			'enableAjaxValidation' => false,
-		)); ?>
+	<div class="row">
+		<div class="col-md-12">
+			<p class="note">Fields with <span class="required">*</span> are required.</p>
 
-		<p class="note">Fields with <span class="required">*</span> are required.</p>
-
-		<?php if ($model->hasErrors()) : ?>
-			<div class="alert alert-danger">
-				<?php echo $form->errorSummary($model); ?>
-			</div>
-		<?php endif; ?>
+			<?php if ($model->hasErrors()) : ?>
+				<div class="alert alert-danger">
+					<?php echo $form->errorSummary($model); ?>
+				</div>
+			<?php endif; ?>
+		</div>
 
 		<?php
 		$this->widget('application.components.controls.TextField', [
@@ -23,6 +24,9 @@
 				'required' => true,
 				'maxlength' => 255
 			],
+			'groupOptions' => [
+				'class' => 'col-md-4'
+			],
 		]);
 
 		$this->widget('application.components.controls.TextField', [
@@ -32,7 +36,11 @@
 			'inputOptions' => [
 				'maxlength' => 255
 			],
+			'groupOptions' => [
+				'class' => 'col-md-4'
+			],
 		]);
+
 		$this->widget('application.components.controls.TextField', [
 			'form' => $form,
 			'model' => $model,
@@ -40,7 +48,11 @@
 			'inputOptions' => [
 				'maxlength' => 255
 			],
+			'groupOptions' => [
+				'class' => 'col-md-4'
+			],
 		]);
+
 		$this->widget('application.components.controls.TextField', [
 			'form' => $form,
 			'model' => $model,
@@ -48,7 +60,11 @@
 			'inputOptions' => [
 				'maxlength' => 255
 			],
+			'groupOptions' => [
+				'class' => 'col-md-12'
+			],
 		]);
+
 		$this->widget('application.components.controls.TextField', [
 			'form' => $form,
 			'model' => $model,
@@ -56,7 +72,11 @@
 			'inputOptions' => [
 				'maxlength' => 128
 			],
+			'groupOptions' => [
+				'class' => 'col-md-6'
+			],
 		]);
+
 		$this->widget('application.components.controls.TextField', [
 			'form' => $form,
 			'model' => $model,
@@ -64,55 +84,59 @@
 			'inputOptions' => [
 				'maxlength' => 128
 			],
+			'groupOptions' => [
+				'class' => 'col-md-6'
+			],
 		]);
 		?>
 
-		<div class="merge-author-info">
-			<?php
-			$identical_authors = $model->getIdenticalAuthors();
-			if (!empty($identical_authors)) {
-			?>
-				<div class="alert alert-gigadb-info">
-					this author is merged with author(s):
-					<ul class="list-unstyled">
-						<?php
-						foreach ($identical_authors as $author_id) {
-							$author = Author::model()->findByPk($author_id);
-							echo "<li>" . $author->getAuthorDetails() . "</li>";
-						}
-						?>
-					</ul>
-
-				</div>
-
-			<?php	} ?>
+		<div class="col-md-12">
+			<div class="merge-author-info">
+				<?php
+				$identical_authors = $model->getIdenticalAuthors();
+				if (!empty($identical_authors)) {
+				?>
+					<div class="alert alert-gigadb-info">
+						this author is merged with author(s):
+						<ul class="list-unstyled">
+							<?php
+							foreach ($identical_authors as $author_id) {
+								$author = Author::model()->findByPk($author_id);
+								echo "<li>" . $author->getAuthorDetails() . "</li>";
+							}
+							?>
+						</ul>
+					</div>
+				<?php	} ?>
 
-			<?php
-			if (!empty($identical_authors)) {
-				echo CHtml::link(
-					'Unmerge author from those authors',
-					array('adminAuthor/unmerge', 'id' => $model->id),
-					array('class' => 'btn btn-link')
-				);
-			}
-			?>
+				<?php
+				if (!empty($identical_authors)) {
+					echo CHtml::link(
+						'Unmerge author from those authors',
+						array('adminAuthor/unmerge', 'id' => $model->id),
+						array('class' => 'btn btn-link')
+					);
+				}
+				?>
+			</div>
 		</div>
 
-		<div class="pull-right btns-row">
-			<?php
-      if ($model->id) {
-        echo CHtml::link(
-          'Merge with an author',
-          array('adminAuthor/prepareAuthorMerge', 'origin_author_id' => $model->id),
-          array('class' => 'btn background-btn-o')
-        );
-      }
-			?>
-			<a href="/adminAuthor/admin" class="btn background-btn-o">Cancel</a>
-			<?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
+		<div class="col-md-12">
+			<div class="pull-right btns-row">
+				<?php
+				if ($model->id) {
+					echo CHtml::link(
+						'Merge with an author',
+						array('adminAuthor/prepareAuthorMerge', 'origin_author_id' => $model->id),
+						array('class' => 'btn background-btn-o btn-min-width')
+					);
+				}
+				?>
+				<a href="/adminAuthor/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+				<?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
+			</div>
 		</div>
-
-		<?php $this->endWidget(); ?>
 	</div>
 
+	<?php $this->endWidget(); ?>
 </div>
\ No newline at end of file
diff --git a/protected/views/adminSample/_form.php b/protected/views/adminSample/_form.php
index 7da3e12146..4cb4c417f7 100644
--- a/protected/views/adminSample/_form.php
+++ b/protected/views/adminSample/_form.php
@@ -1,89 +1,91 @@
 <div class="section form">
-    <?php $form = $this->beginWidget('CActiveForm', array(
-        'id' => 'sample-form',
-        'enableAjaxValidation' => false,
-        'htmlOptions' => [
-            'class' => 'row'
-        ]
-    )); ?>
+  <?php $form = $this->beginWidget('CActiveForm', array(
+    'id' => 'sample-form',
+    'enableAjaxValidation' => false,
+    'htmlOptions' => [
+      'class' => 'row'
+    ]
+  )); ?>
 
-    <div class="col-md-12">
-        <p class="note">Fields with <span class="required">*</span> are required.</p>
+  <div class="col-md-12">
+    <p class="note">Fields with <span class="required">*</span> are required.</p>
 
-        <?php if ($model->hasErrors()) : ?>
-            <div class="alert alert-danger">
-                <?php echo $form->errorSummary($model); ?>
-            </div>
-        <?php endif; ?>
-    </div>
+    <?php if ($model->hasErrors()): ?>
+      <div class="alert alert-danger">
+        <?php echo $form->errorSummary($model); ?>
+      </div>
+    <?php endif; ?>
+  </div>
 
-    <div class="col-md-6">
-        <div class="form-group">
-            <?php echo $form->labelEx($model, 'species_id', array('class' => 'control-label')); ?>
-            <?php
-            $criteria = new CDbCriteria;
-            $criteria->select = 't.id, t.common_name';
-            $criteria->limit = 100;
+  <div class="col-md-6">
+    <div class="form-group">
+      <?php echo $form->labelEx($model, 'species_id', array('class' => 'control-label')); ?>
+      <?php
+      $criteria = new CDbCriteria;
+      $criteria->select = 't.id, t.common_name';
+      $criteria->limit = 100;
 
-            $this->widget('zii.widgets.jui.CJuiAutoComplete', array(
-                'name' => 'name',
-                'model' => $model,
-                'attribute' => 'species_id',
-                'source' => $this->createUrl('/adminDatasetSample/autocomplete'),
-                'options' => array(
-                    'minLength' => '2',
-                ),
-                'htmlOptions' => array(
-                    'aria-describedby' => $form->error($model, 'species_id') ? 'species_id-desc' : '',
-                    'required' => true,
-                    'aria-required' => 'true',
-                    'class' => 'form-control',
-                    'placeholder' => 'name',
-                    'size' => 'auto',
-                ),
-            ));
-            ?>
+      $this->widget('zii.widgets.jui.CJuiAutoComplete', array(
+        'name' => 'name',
+        'model' => $model,
+        'attribute' => 'species_id',
+        'source' => $this->createUrl('/adminDatasetSample/autocomplete'),
+        'options' => array(
+          'minLength' => '2',
+        ),
+        'htmlOptions' => array(
+          'aria-describedby' => $form->error($model, 'species_id') ? 'species_id-desc' : '',
+          'required' => true,
+          'aria-required' => 'true',
+          'class' => 'form-control',
+          'placeholder' => 'name',
+          'size' => 'auto',
+        ),
+      ));
+      ?>
 
-            <div role="alert" id="species_id-error">
-                <?php echo $form->error($model, 'species_id'); ?>
-            </div>
-        </div>
+      <div role="alert" id="species_id-error">
+        <?php echo $form->error($model, 'species_id'); ?>
+      </div>
     </div>
+  </div>
 
-    <div class="col-md-6">
-        <?php
-        $this->widget('application.components.controls.TextField', [
-            'form' => $form,
-            'model' => $model,
-            'attributeName' => 'name',
-            'inputOptions' => [
-                'maxlength' => 50
-            ],
-        ]);
-        ?>
-    </div>
+  <?php
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'name',
+    'inputOptions' => [
+      'maxlength' => 50
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-6'
+    ]
+  ]);
+  ?>
 
-    <div class="col-md-12">
-        <?php
-        $model->attributesList = $model->attributesList ? $model->attributesList :  $model->getAttributesList(true);
-        $this->widget('application.components.controls.TextArea', [
-            'form' => $form,
-            'model' => $model,
-            'attributeName' => 'attributesList',
-            'inputOptions' => [
-                'rows' => 6,
-                'cols' => 50
-            ],
-        ]);
-        ?>
-    </div>
+  <?php
+  $model->attributesList = $model->attributesList ? $model->attributesList : $model->getAttributesList(true);
+  $this->widget('application.components.controls.TextArea', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'attributesList',
+    'inputOptions' => [
+      'rows' => 6,
+      'cols' => 50
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ]
+  ]);
+  ?>
 
-    <div class="col-md-12">
-        <div class="pull-right btns-row">
-            <a href="/adminSample/admin" class="btn background-btn-o">Cancel</a>
-            <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
-        </div>
+  <div class="col-md-12">
+    <div class="pull-right btns-row">
+      <a href="/adminSample/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+      <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
     </div>
+  </div>
 
-    <?php $this->endWidget(); ?>
+  <?php $this->endWidget(); ?>
 </div>
\ No newline at end of file

From ece6a2bd00653fc919a090f193aee69630e6810c Mon Sep 17 00:00:00 2001
From: luis-toptal <luis.martinez@toptal.com>
Date: Sat, 23 Nov 2024 13:47:47 +0700
Subject: [PATCH 04/11] feat: tweaks responsive btn width

---
 less/modules/buttons.less | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/less/modules/buttons.less b/less/modules/buttons.less
index b16c7641f0..2ab4bdead4 100644
--- a/less/modules/buttons.less
+++ b/less/modules/buttons.less
@@ -47,6 +47,9 @@
   display: flex;
   justify-content: center;
   align-items: center;
+  @media (min-width: 768px) {
+    min-width: 150px;
+  }
 }
 
 

From b94585eb72577b910c421bda2e4565b85207d6a3 Mon Sep 17 00:00:00 2001
From: luis-toptal <luis.martinez@toptal.com>
Date: Sat, 23 Nov 2024 13:54:58 +0700
Subject: [PATCH 05/11] feat: admin dataset form and tweaks on other forms

---
 protected/views/adminAuthor/_form.php        | 257 ++++----
 protected/views/adminDatasetAuthor/_form.php | 126 ++--
 protected/views/adminFile/_form.php          | 604 ++++++++++---------
 3 files changed, 503 insertions(+), 484 deletions(-)

diff --git a/protected/views/adminAuthor/_form.php b/protected/views/adminAuthor/_form.php
index 8ac85cf20a..933c004979 100644
--- a/protected/views/adminAuthor/_form.php
+++ b/protected/views/adminAuthor/_form.php
@@ -1,142 +1,143 @@
 <div class="section form">
-	<?php $form = $this->beginWidget('CActiveForm', array(
-		'id' => 'author-form',
-		'enableAjaxValidation' => false,
-	)); ?>
+  <?php $form = $this->beginWidget('CActiveForm', array(
+    'id' => 'author-form',
+    'enableAjaxValidation' => false,
+    'htmlOptions' => [
+      'class' => 'row'
+    ]
+  )); ?>
 
-	<div class="row">
-		<div class="col-md-12">
-			<p class="note">Fields with <span class="required">*</span> are required.</p>
+  <div class="col-md-12">
+    <p class="note">Fields with <span class="required">*</span> are required.</p>
 
-			<?php if ($model->hasErrors()) : ?>
-				<div class="alert alert-danger">
-					<?php echo $form->errorSummary($model); ?>
-				</div>
-			<?php endif; ?>
-		</div>
+    <?php if ($model->hasErrors()): ?>
+      <div class="alert alert-danger">
+        <?php echo $form->errorSummary($model); ?>
+      </div>
+    <?php endif; ?>
+  </div>
 
-		<?php
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'surname',
-			'inputOptions' => [
-				'required' => true,
-				'maxlength' => 255
-			],
-			'groupOptions' => [
-				'class' => 'col-md-4'
-			],
-		]);
+  <?php
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'surname',
+    'inputOptions' => [
+      'required' => true,
+      'maxlength' => 255
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-4'
+    ],
+  ]);
 
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'first_name',
-			'inputOptions' => [
-				'maxlength' => 255
-			],
-			'groupOptions' => [
-				'class' => 'col-md-4'
-			],
-		]);
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'first_name',
+    'inputOptions' => [
+      'maxlength' => 255
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-4'
+    ],
+  ]);
 
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'middle_name',
-			'inputOptions' => [
-				'maxlength' => 255
-			],
-			'groupOptions' => [
-				'class' => 'col-md-4'
-			],
-		]);
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'middle_name',
+    'inputOptions' => [
+      'maxlength' => 255
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-4'
+    ],
+  ]);
 
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'custom_name',
-			'inputOptions' => [
-				'maxlength' => 255
-			],
-			'groupOptions' => [
-				'class' => 'col-md-12'
-			],
-		]);
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'custom_name',
+    'inputOptions' => [
+      'maxlength' => 255
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ],
+  ]);
 
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'orcid',
-			'inputOptions' => [
-				'maxlength' => 128
-			],
-			'groupOptions' => [
-				'class' => 'col-md-6'
-			],
-		]);
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'orcid',
+    'inputOptions' => [
+      'maxlength' => 128
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-6'
+    ],
+  ]);
 
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'gigadb_user_id',
-			'inputOptions' => [
-				'maxlength' => 128
-			],
-			'groupOptions' => [
-				'class' => 'col-md-6'
-			],
-		]);
-		?>
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'gigadb_user_id',
+    'inputOptions' => [
+      'maxlength' => 128
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-6'
+    ],
+  ]);
+  ?>
 
-		<div class="col-md-12">
-			<div class="merge-author-info">
-				<?php
-				$identical_authors = $model->getIdenticalAuthors();
-				if (!empty($identical_authors)) {
-				?>
-					<div class="alert alert-gigadb-info">
-						this author is merged with author(s):
-						<ul class="list-unstyled">
-							<?php
-							foreach ($identical_authors as $author_id) {
-								$author = Author::model()->findByPk($author_id);
-								echo "<li>" . $author->getAuthorDetails() . "</li>";
-							}
-							?>
-						</ul>
-					</div>
-				<?php	} ?>
+  <div class="col-md-12">
+    <div class="merge-author-info">
+      <?php
+      $identical_authors = $model->getIdenticalAuthors();
+      if (!empty($identical_authors)) {
+        ?>
+        <div class="alert alert-gigadb-info">
+          this author is merged with author(s):
+          <ul class="list-unstyled">
+            <?php
+            foreach ($identical_authors as $author_id) {
+              $author = Author::model()->findByPk($author_id);
+              echo "<li>" . $author->getAuthorDetails() . "</li>";
+            }
+            ?>
+          </ul>
+        </div>
+      <?php } ?>
 
-				<?php
-				if (!empty($identical_authors)) {
-					echo CHtml::link(
-						'Unmerge author from those authors',
-						array('adminAuthor/unmerge', 'id' => $model->id),
-						array('class' => 'btn btn-link')
-					);
-				}
-				?>
-			</div>
-		</div>
+      <?php
+      if (!empty($identical_authors)) {
+        echo CHtml::link(
+          'Unmerge author from those authors',
+          array('adminAuthor/unmerge', 'id' => $model->id),
+          array('class' => 'btn btn-link')
+        );
+      }
+      ?>
+    </div>
+  </div>
 
-		<div class="col-md-12">
-			<div class="pull-right btns-row">
-				<?php
-				if ($model->id) {
-					echo CHtml::link(
-						'Merge with an author',
-						array('adminAuthor/prepareAuthorMerge', 'origin_author_id' => $model->id),
-						array('class' => 'btn background-btn-o btn-min-width')
-					);
-				}
-				?>
-				<a href="/adminAuthor/admin" class="btn background-btn-o btn-min-width">Cancel</a>
-				<?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
-			</div>
-		</div>
-	</div>
+  <div class="col-md-12">
+    <div class="pull-right btns-row">
+      <?php
+      if ($model->id) {
+        echo CHtml::link(
+          'Merge with an author',
+          array('adminAuthor/prepareAuthorMerge', 'origin_author_id' => $model->id),
+          array('class' => 'btn background-btn-o btn-min-width')
+        );
+      }
+      ?>
+      <a href="/adminAuthor/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+      <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
+    </div>
+  </div>
 
-	<?php $this->endWidget(); ?>
+  <?php $this->endWidget(); ?>
 </div>
\ No newline at end of file
diff --git a/protected/views/adminDatasetAuthor/_form.php b/protected/views/adminDatasetAuthor/_form.php
index 9de668db55..8ef352c106 100644
--- a/protected/views/adminDatasetAuthor/_form.php
+++ b/protected/views/adminDatasetAuthor/_form.php
@@ -1,64 +1,76 @@
-<div class="section form row">
+<div class="section form">
+  <?php $form = $this->beginWidget('CActiveForm', array(
+    'id' => 'dataset-author-form',
+    'enableAjaxValidation' => false,
+    'htmlOptions' => [
+      'class' => 'row'
+    ]
+  )); ?>
 
-	<div class="col-md-offset-3 col-md-6">
-		<?php $form = $this->beginWidget('CActiveForm', array(
-			'id' => 'dataset-author-form',
-			'enableAjaxValidation' => false,
-		)); ?>
+  <div class="col-md-12">
+    <p class="note">Fields with <span class="required">*</span> are required.</p>
 
-		<p class="note">Fields with <span class="required">*</span> are required.</p>
+    <?php if ($model->hasErrors()): ?>
+      <div class="alert alert-danger">
+        <?php echo $form->errorSummary($model); ?>
+      </div>
+    <?php endif; ?>
+  </div>
 
-		<?php if ($model->hasErrors()) : ?>
-			<div class="alert alert-danger">
-				<?php echo $form->errorSummary($model); ?>
-			</div>
-		<?php endif; ?>
+  <?php
+  $this->widget('application.components.controls.DropdownField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'dataset_id',
+    'listDataOptions' => [
+      'data' => Util::getDois(),
+      'valueField' => 'id',
+      'textField' => 'identifier',
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ],
+  ]);
+  ?>
 
-		<?php
-		$this->widget('application.components.controls.DropdownField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'dataset_id',
-			'listDataOptions' => [
-				'data' => Util::getDois(),
-				'valueField' => 'id',
-				'textField' => 'identifier',
-			],
-		]);
-		?>
+  <?php
+  $this->widget('application.components.controls.DropdownField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'author_id',
+    'listDataOptions' => [
+      'data' => Author::model()->findAll(array('order' => 'surname')),
+      'valueField' => 'id',
+      'textField' => 'fullAuthor',
+    ],
+    'enableSorting' => true,
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ],
+  ]);
+  ?>
 
-		<?php
-		$this->widget('application.components.controls.DropdownField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'author_id',
-			'listDataOptions' => [
-				'data' => Author::model()->findAll(array('order' => 'surname')),
-				'valueField' => 'id',
-				'textField' => 'fullAuthor',
-			],
-      'enableSorting' => true,
-		]);
-		?>
+  <?php
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'rank',
+    'inputOptions' => [
+      'required' => 'required',
+      'aria-required' => 'true',
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ],
+  ]);
+  ?>
 
-		<?php
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'rank',
-			'inputOptions' => [
-				'required' => 'required',
-				'aria-required' => 'true',
-			],
-		]);
-		?>
+  <div class="col-md-12">
+    <div class="pull-right btns-row">
+      <a href="/adminDatasetAuthor/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+      <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
+    </div>
+  </div>
 
-		<div class="pull-right btns-row">
-			<a href="/adminDatasetAuthor/admin" class="btn background-btn-o">Cancel</a>
-			<?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
-		</div>
-
-		<?php $this->endWidget(); ?>
-	</div>
-
-</div><!-- form -->
\ No newline at end of file
+  <?php $this->endWidget(); ?>
+</div>
\ No newline at end of file
diff --git a/protected/views/adminFile/_form.php b/protected/views/adminFile/_form.php
index c25c1af51c..e80f757f08 100644
--- a/protected/views/adminFile/_form.php
+++ b/protected/views/adminFile/_form.php
@@ -1,277 +1,283 @@
 <div class="section form">
 
-    <div>
-        <?php $form = $this->beginWidget('CActiveForm', array(
-            'id' => 'file-form',
-            'enableAjaxValidation' => false,
-            'htmlOptions' => [
-                'class' => 'row'
-            ]
-        )); ?>
+  <div>
+    <?php $form = $this->beginWidget('CActiveForm', array(
+      'id' => 'file-form',
+      'enableAjaxValidation' => false,
+      'htmlOptions' => [
+        'class' => 'row'
+      ]
+    )); ?>
 
-        <p class="note col-md-12">Fields with <span class="required">*</span> are required.</p>
+    <p class="note col-md-12">Fields with <span class="required">*</span> are required.</p>
 
-        <?php if ($model->hasErrors()) : ?>
-            <div class="alert alert-danger col-md-12">
-                <?php echo $form->errorSummary($model); ?>
-            </div>
-        <?php endif; ?>
+    <?php if ($model->hasErrors()): ?>
+      <div class="alert alert-danger col-md-12">
+        <?php echo $form->errorSummary($model); ?>
+      </div>
+    <?php endif; ?>
 
 
-        <?php
-        $this->widget('application.components.controls.DropdownField', [
-            'form' => $form,
-            'model' => $model,
-            'attributeName' => 'dataset_id',
-            'listDataOptions' => [
-                'data' => Util::getDois(),
-                'valueField' => 'id',
-                'textField' => 'identifier',
-            ],
-            'groupOptions' => [
-                'class' => 'col-md-6'
-            ],
-            'inputOptions' => [
-                'required' => true,
-            ],
-            'tooltip' => 'The DOI of the dataset to which the file is linked, select from dropdown menu'
-        ]);
-        $this->widget('application.components.controls.TextField', [
-            'form' => $form,
-            'model' => $model,
-            'attributeName' => 'name',
-            'groupOptions' => [
-                'class' => 'col-md-6'
-            ],
-            'inputOptions' => [
-                'required' => true,
-                'maxlength' => 100
-            ],
-            'tooltip' => 'the name of the file as it will appear in the file table on the dataset page'
-        ]);
-        $this->widget('application.components.controls.TextField', [
-            'form' => $form,
-            'model' => $model,
-            'attributeName' => 'location',
-            'groupOptions' => [
-                'class' => 'col-md-12'
-            ],
-            'inputOptions' => [
-                'required' => true,
-                'maxlength' => 200
-            ],
-            'tooltip' => 'Complete path of the file location including the server'
-        ]);
-        $this->widget('application.components.controls.TextField', [
-            'form' => $form,
-            'model' => $model,
-            'attributeName' => 'extension',
-            'groupOptions' => [
-                'class' => 'col-md-4'
-            ],
-            'inputOptions' => [
-                'required' => true,
-                'maxlength' => 30
-            ],
-            'tooltip' => 'The file extension, usually ignoring any archive related extension, e.g. something.fasta.gz would have extension fasta not gz'
-        ]);
-        $this->widget('application.components.controls.TextField', [
-            'form' => $form,
-            'model' => $model,
-            'attributeName' => 'size',
-            'groupOptions' => [
-                'class' => 'col-md-4'
-            ],
-            'inputOptions' => [
-                'required' => true,
-            ],
-            'tooltip' => 'The size of file on disk in bytes'
-        ]);
-        $this->widget('application.components.controls.DateField', [
-            'form' => $form,
-            'model' => $model,
-            'attributeName' => 'date_stamp',
-            'groupOptions' => [
-                'class' => 'col-md-4'
-            ],
-            'tooltip' => 'The date the file is made publicly available, usually the same as the dataset release date. Format: yyyy-mm-dd'
-        ]);
-        $this->widget('application.components.controls.TextArea', [
-            'form' => $form,
-            'model' => $model,
-            'attributeName' => 'description',
-            'groupOptions' => [
-                'class' => 'col-md-12'
-            ],
-            'inputOptions' => [
-                'rows' => 6,
-                'cols' => 50
-            ],
-            'tooltip' => 'The description of the files content'
-        ]);
-        $this->widget('application.components.controls.DropdownField', [
-            'form' => $form,
-            'model' => $model,
-            'attributeName' => 'format_id',
-            'groupOptions' => [
-                'class' => 'col-md-6'
-            ],
-            'listDataOptions' => [
-                'data' => FileFormat::model()->findAll(),
-                'valueField' => 'id',
-                'textField' => 'name',
-            ],
-            'tooltip' => 'The format of the file content, usually a MIME format, select from the dropdown menu'
-        ]);
-        $this->widget('application.components.controls.DropdownField', [
-            'form' => $form,
-            'model' => $model,
-            'attributeName' => 'type_id',
-            'groupOptions' => [
-                'class' => 'col-md-6'
-            ],
-            'listDataOptions' => [
-                'data' => FileType::model()->findAll(),
-                'valueField' => 'id',
-                'textField' => 'name',
-            ],
-            'tooltip' => 'The type of data contained in the file, select from the dropdown menu'
-        ]);
-        $this->widget('application.components.controls.TextField', [
-            'form' => $form,
-            'model' => $model,
-            'attributeName' => 'sample_name',
-            'groupOptions' => [
-                'class' => 'col-md-12'
-            ],
-            'tooltip' => 'If the file is directly and solely related to a single Sample entity named in GigaDB, a link to that sample can be added here by entering the exact name of the sample'
-        ]);
-        ?>
+    <?php
+    $this->widget('application.components.controls.DropdownField', [
+      'form' => $form,
+      'model' => $model,
+      'attributeName' => 'dataset_id',
+      'listDataOptions' => [
+        'data' => Util::getDois(),
+        'valueField' => 'id',
+        'textField' => 'identifier',
+      ],
+      'groupOptions' => [
+        'class' => 'col-md-6'
+      ],
+      'inputOptions' => [
+        'required' => true,
+      ],
+      'tooltip' => 'The DOI of the dataset to which the file is linked, select from dropdown menu'
+    ]);
+    $this->widget('application.components.controls.TextField', [
+      'form' => $form,
+      'model' => $model,
+      'attributeName' => 'name',
+      'groupOptions' => [
+        'class' => 'col-md-6'
+      ],
+      'inputOptions' => [
+        'required' => true,
+        'maxlength' => 100
+      ],
+      'tooltip' => 'the name of the file as it will appear in the file table on the dataset page'
+    ]);
+    $this->widget('application.components.controls.TextField', [
+      'form' => $form,
+      'model' => $model,
+      'attributeName' => 'location',
+      'groupOptions' => [
+        'class' => 'col-md-12'
+      ],
+      'inputOptions' => [
+        'required' => true,
+        'maxlength' => 200
+      ],
+      'tooltip' => 'Complete path of the file location including the server'
+    ]);
+    $this->widget('application.components.controls.TextField', [
+      'form' => $form,
+      'model' => $model,
+      'attributeName' => 'extension',
+      'groupOptions' => [
+        'class' => 'col-md-4'
+      ],
+      'inputOptions' => [
+        'required' => true,
+        'maxlength' => 30
+      ],
+      'tooltip' => 'The file extension, usually ignoring any archive related extension, e.g. something.fasta.gz would have extension fasta not gz'
+    ]);
+    $this->widget('application.components.controls.TextField', [
+      'form' => $form,
+      'model' => $model,
+      'attributeName' => 'size',
+      'groupOptions' => [
+        'class' => 'col-md-4'
+      ],
+      'inputOptions' => [
+        'required' => true,
+      ],
+      'tooltip' => 'The size of file on disk in bytes'
+    ]);
+    $this->widget('application.components.controls.DateField', [
+      'form' => $form,
+      'model' => $model,
+      'attributeName' => 'date_stamp',
+      'groupOptions' => [
+        'class' => 'col-md-4'
+      ],
+      'tooltip' => 'The date the file is made publicly available, usually the same as the dataset release date. Format: yyyy-mm-dd'
+    ]);
+    $this->widget('application.components.controls.TextArea', [
+      'form' => $form,
+      'model' => $model,
+      'attributeName' => 'description',
+      'groupOptions' => [
+        'class' => 'col-md-12'
+      ],
+      'inputOptions' => [
+        'rows' => 6,
+        'cols' => 50
+      ],
+      'tooltip' => 'The description of the files content'
+    ]);
+    $this->widget('application.components.controls.DropdownField', [
+      'form' => $form,
+      'model' => $model,
+      'attributeName' => 'format_id',
+      'groupOptions' => [
+        'class' => 'col-md-6'
+      ],
+      'listDataOptions' => [
+        'data' => FileFormat::model()->findAll(),
+        'valueField' => 'id',
+        'textField' => 'name',
+      ],
+      'tooltip' => 'The format of the file content, usually a MIME format, select from the dropdown menu'
+    ]);
+    $this->widget('application.components.controls.DropdownField', [
+      'form' => $form,
+      'model' => $model,
+      'attributeName' => 'type_id',
+      'groupOptions' => [
+        'class' => 'col-md-6'
+      ],
+      'listDataOptions' => [
+        'data' => FileType::model()->findAll(),
+        'valueField' => 'id',
+        'textField' => 'name',
+      ],
+      'tooltip' => 'The type of data contained in the file, select from the dropdown menu'
+    ]);
+    $this->widget('application.components.controls.TextField', [
+      'form' => $form,
+      'model' => $model,
+      'attributeName' => 'sample_name',
+      'groupOptions' => [
+        'class' => 'col-md-12'
+      ],
+      'tooltip' => 'If the file is directly and solely related to a single Sample entity named in GigaDB, a link to that sample can be added here by entering the exact name of the sample'
+    ]);
+    ?>
 
-        <?php if (!$model->isNewRecord) { ?>
-            <div class="control-group col-md-12">
-            <?php if ($model->fileAttributes) { ?>
-                    <table class="table table-attr">
-                        <caption>Attributes</caption>
-                        <thead>
-                            <tr>
-                                <th style="width: 25%">Attribute Name</th>
-                                <th style="width: 40%">Value</th>
-                                <th style="width: 15%">Unit</th>
-                                <th style="width: 20%">Actions</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <?php foreach ($model->fileAttributes as $fa) { ?>
-                                <tr class="row-edit-<?= $fa->id ?>">
-                                    <td class="text-nowrap">
-                                        <?= $fa->attribute->attribute_name ?>
-                                    </td>
-                                    <td>
-                                        <?= $fa->value ?>
-                                    </td>
-                                    <td class="text-nowrap">
-                                        <?= $fa->unit ? $fa->unit->name : '' ?>
-                                    </td>
-                                    <td>
-                                        <div class="action-btns">
-                                            <button class="btn btn-link btn-edit js-edit" data-test="edit-attr-btn" data="<?= $fa->id ?>">Edit</button>
-                                            <button class="btn btn-link js-delete" name="delete_file_attr" data-test="delete-attr-btn" data="<?= $fa->id ?>">Delete</button>
-                                        </div>
-                                    </td>
-                                </tr>
-                            <?php } ?>
-                        </tbody>
-                    </table>
-                <?php } ?>
-                <br />
-                <button type="button" class="btn background-btn-o js-btn-attr" aria-expanded="false" aria-controls="newAttrForm" data-test="new-attr-btn" data-toggle="tooltip" title="Show and/or Add file attributes"><span class="js-btn-attr-label">Show New Attribute Fields</span> <i class="fa fa-caret-down js-caret-type" aria-hidden="true"></i></button>
-                <br />
-                <fieldset id="newAttrForm" class="js-new-attr mt-10 mb-20 row" aria-label="New attribute fields" style="display:none;">
-                    <div class="col-md-4">
-                        <?php
-                        $this->widget('application.components.controls.DropdownField', [
-                            'form' => $form,
-                            'model' => $attribute,
-                            'attributeName' => '[new]attribute_id',
-                            'listDataOptions' => [
-                                'data' => Attributes::model()->findAll(),
-                                'valueField' => 'id',
-                                'textField' => 'attribute_name',
-                            ],
-                            'groupOptions' => [
-                                'class' => 'mb-10'
-                            ],
-                            'inputOptions' => array(
-                                'empty' => 'Select name',
-                                'class' => 'attr-form js-new-attr-name',
-                            ),
-                            'tooltip' => 'Choose the appropriate attribute name from the dropdown menu'
-                        ]);
-                        ?>
-                    </div>
-                    <div class="col-md-4">
-                        <?php
-                        $this->widget('application.components.controls.TextField', [
-                            'form' => $form,
-                            'model' => $attribute,
-                            'attributeName' => '[new]value',
-                            'groupOptions' => [
-                                'class' => 'mb-10'
-                            ],
-                            'inputOptions' => [
-                                'class' => 'attr-form',
-                                'maxlength' => 1000
-                            ],
-                            'tooltip' => 'The value of the chosen attribute for this file'
-                        ]);
-                        ?>
-                    </div>
-                    <div class="col-md-4">
-                        <?php
-                        $this->widget('application.components.controls.DropdownField', [
-                            'form' => $form,
-                            'model' => $attribute,
-                            'attributeName' => '[new]unit_id',
-                            'groupOptions' => [
-                                'class' => 'mb-10'
-                            ],
-                            'listDataOptions' => [
-                                'data' => Unit::model()->findAll(),
-                                'valueField' => 'id',
-                                'textField' => 'name',
-                            ],
-                            'inputOptions' => array(
-                                'empty' => 'Select unit',
-                                'class' => 'attr-form'
-                            ),
-                            'tooltip' => 'If units should be specified, select the appropriate value from the dropdown menu, otherwise leave blank'
-                        ]);
-                        ?>
-                    </div>
-                    <div class="col-xs-12">
-                      <div class="pull-right btns-row">
-                          <input type="submit" class="btn background-btn" name="submit_attr" value="Add attribute" />
-                      </div>
+    <?php if (!$model->isNewRecord) { ?>
+      <div class="control-group col-md-12">
+        <?php if ($model->fileAttributes) { ?>
+          <table class="table table-attr">
+            <caption>Attributes</caption>
+            <thead>
+              <tr>
+                <th style="width: 25%">Attribute Name</th>
+                <th style="width: 40%">Value</th>
+                <th style="width: 15%">Unit</th>
+                <th style="width: 20%">Actions</th>
+              </tr>
+            </thead>
+            <tbody>
+              <?php foreach ($model->fileAttributes as $fa) { ?>
+                <tr class="row-edit-<?= $fa->id ?>">
+                  <td class="text-nowrap">
+                    <?= $fa->attribute->attribute_name ?>
+                  </td>
+                  <td>
+                    <?= $fa->value ?>
+                  </td>
+                  <td class="text-nowrap">
+                    <?= $fa->unit ? $fa->unit->name : '' ?>
+                  </td>
+                  <td>
+                    <div class="action-btns">
+                      <button class="btn btn-link btn-edit js-edit" data-test="edit-attr-btn"
+                        data="<?= $fa->id ?>">Edit</button>
+                      <button class="btn btn-link js-delete" name="delete_file_attr" data-test="delete-attr-btn"
+                        data="<?= $fa->id ?>">Delete</button>
                     </div>
-                    <br />
-                </fieldset>
-            </div>
+                  </td>
+                </tr>
+              <?php } ?>
+            </tbody>
+          </table>
         <?php } ?>
-        <div class="col-md-12">
+        <br />
+        <button type="button" class="btn background-btn-o js-btn-attr" aria-expanded="false" aria-controls="newAttrForm"
+          data-test="new-attr-btn" data-toggle="tooltip" title="Show and/or Add file attributes"><span
+            class="js-btn-attr-label">Show New Attribute Fields</span> <i class="fa fa-caret-down js-caret-type"
+            aria-hidden="true"></i></button>
+        <br />
+        <fieldset id="newAttrForm" class="js-new-attr mt-10 mb-20 row" aria-label="New attribute fields"
+          style="display:none;">
+          <div class="col-md-4">
+            <?php
+            $this->widget('application.components.controls.DropdownField', [
+              'form' => $form,
+              'model' => $attribute,
+              'attributeName' => '[new]attribute_id',
+              'listDataOptions' => [
+                'data' => Attributes::model()->findAll(),
+                'valueField' => 'id',
+                'textField' => 'attribute_name',
+              ],
+              'groupOptions' => [
+                'class' => 'mb-10'
+              ],
+              'inputOptions' => array(
+                'empty' => 'Select name',
+                'class' => 'attr-form js-new-attr-name',
+              ),
+              'tooltip' => 'Choose the appropriate attribute name from the dropdown menu'
+            ]);
+            ?>
+          </div>
+          <div class="col-md-4">
+            <?php
+            $this->widget('application.components.controls.TextField', [
+              'form' => $form,
+              'model' => $attribute,
+              'attributeName' => '[new]value',
+              'groupOptions' => [
+                'class' => 'mb-10'
+              ],
+              'inputOptions' => [
+                'class' => 'attr-form',
+                'maxlength' => 1000
+              ],
+              'tooltip' => 'The value of the chosen attribute for this file'
+            ]);
+            ?>
+          </div>
+          <div class="col-md-4">
+            <?php
+            $this->widget('application.components.controls.DropdownField', [
+              'form' => $form,
+              'model' => $attribute,
+              'attributeName' => '[new]unit_id',
+              'groupOptions' => [
+                'class' => 'mb-10'
+              ],
+              'listDataOptions' => [
+                'data' => Unit::model()->findAll(),
+                'valueField' => 'id',
+                'textField' => 'name',
+              ],
+              'inputOptions' => array(
+                'empty' => 'Select unit',
+                'class' => 'attr-form'
+              ),
+              'tooltip' => 'If units should be specified, select the appropriate value from the dropdown menu, otherwise leave blank'
+            ]);
+            ?>
+          </div>
+          <div class="col-xs-12">
             <div class="pull-right btns-row">
-                <a href="/adminFile/admin" class="btn background-btn-o btn-min-width">Cancel</a>
-                <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
+              <input type="submit" class="btn background-btn" name="submit_attr" value="Add attribute" />
             </div>
-        </div>
-
-        <?php $this->endWidget(); ?>
+          </div>
+          <br />
+        </fieldset>
+      </div>
+    <?php } ?>
+    <div class="col-md-12">
+      <div class="pull-right btns-row">
+        <a href="/adminFile/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+        <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
+      </div>
     </div>
 
+    <?php $this->endWidget(); ?>
+  </div>
+
 </div>
 
 <script type="text/javascript">
-  $(document).ready(function() {
+  $(document).ready(function () {
     const toggleBtn = $('.js-btn-attr');
     const caret = $(toggleBtn).children(".js-caret-type");
     const label = $(toggleBtn).children(".js-btn-attr-label");
@@ -283,8 +289,8 @@ function collapseNewAttrForm() {
       caret.removeClass("fa-caret-up").addClass("fa-caret-down");
       label.text("Show New Attribute Fields");
       newAttrNameInput.attr({
-          "required": false,
-          "aria-required": "false"
+        "required": false,
+        "aria-required": "false"
       });
     }
 
@@ -294,62 +300,62 @@ function expandNewAttrForm() {
       caret.removeClass("fa-caret-down").addClass("fa-caret-up");
       label.text("Hide New Attribute Fields");
       newAttrNameInput.attr({
-          "required": true,
-          "aria-required": "true"
+        "required": true,
+        "aria-required": "true"
       });
     }
 
     function toggleNewAttrForm() {
       const isExpanded = $('.js-btn-attr').attr("aria-expanded") === "true";
       if (isExpanded) {
-          collapseNewAttrForm();
+        collapseNewAttrForm();
       } else {
-          expandNewAttrForm();
+        expandNewAttrForm();
       }
     }
     // NOTE click listener on the document because the button is in a partial view
-    $(document).on('click', '.js-save-attr-edit-btn', function(e) {
+    $(document).on('click', '.js-save-attr-edit-btn', function (e) {
       collapseNewAttrForm();
     });
-    $('.js-btn-attr').click(function(e) {
-        e.preventDefault();
-        toggleNewAttrForm()
+    $('.js-btn-attr').click(function (e) {
+      e.preventDefault();
+      toggleNewAttrForm()
     })
 
-    $('.js-edit').click(function(e) {
-        e.preventDefault();
-        const id = $(this).attr('data');
+    $('.js-edit').click(function (e) {
+      e.preventDefault();
+      const id = $(this).attr('data');
 
-        const row = $('.row-edit-' + id);
-        if (id) {
-            $.post('/adminFile/editAttr', {
-                'id': id
-            }, function(result) {
-                if (result.success) {
-                    row.html(result.data);
-                }
-            }, 'json');
-        }
+      const row = $('.row-edit-' + id);
+      if (id) {
+        $.post('/adminFile/editAttr', {
+          'id': id
+        }, function (result) {
+          if (result.success) {
+            row.html(result.data);
+          }
+        }, 'json');
+      }
     })
 
     // Handle attribute delete
-    $('.js-delete').click(function(e) {
-        e.preventDefault();
-        const id = $(this).attr('data');
-        const row = $('.row-edit-' + id);
-        if (id) {
-            $.post('/adminFile/deleteFileAttribute', {
-                'id': id
-            }, function(result) {
-                if (result) {
-                    // console.log(result);
-                }
-            }, 'json');
-        }
-        // Give enough time to the database to update before reloading the page
-        setTimeout(() => {
-            window.location.reload();
-        }, 200);
+    $('.js-delete').click(function (e) {
+      e.preventDefault();
+      const id = $(this).attr('data');
+      const row = $('.row-edit-' + id);
+      if (id) {
+        $.post('/adminFile/deleteFileAttribute', {
+          'id': id
+        }, function (result) {
+          if (result) {
+            // console.log(result);
+          }
+        }, 'json');
+      }
+      // Give enough time to the database to update before reloading the page
+      setTimeout(() => {
+        window.location.reload();
+      }, 200);
     })
   })
-</script>
+</script>
\ No newline at end of file

From cbd318b9fccc0469fda00fe964a93c38bec68b17 Mon Sep 17 00:00:00 2001
From: luis-toptal <luis.martinez@toptal.com>
Date: Sat, 23 Nov 2024 13:56:22 +0700
Subject: [PATCH 06/11] feat: admin dataset sample form

---
 protected/views/adminDatasetSample/_form.php | 85 +++++++++++---------
 1 file changed, 47 insertions(+), 38 deletions(-)

diff --git a/protected/views/adminDatasetSample/_form.php b/protected/views/adminDatasetSample/_form.php
index f76431a553..24f94700e8 100644
--- a/protected/views/adminDatasetSample/_form.php
+++ b/protected/views/adminDatasetSample/_form.php
@@ -1,11 +1,13 @@
-<div class="section form row">
-
-	<div class="col-md-offset-3 col-md-6">
-		<?php $form = $this->beginWidget('CActiveForm', array(
-			'id' => 'dataset-sample-form',
-			'enableAjaxValidation' => false,
-		)); ?>
-
+<div class="section form">
+	<?php $form = $this->beginWidget('CActiveForm', array(
+		'id' => 'dataset-sample-form',
+		'enableAjaxValidation' => false,
+		'htmlOptions' => [
+			'class' => 'row'
+		]
+	)); ?>
+
+	<div class="col-md-12">
 		<p class="note">Fields with <span class="required">*</span> are required.</p>
 
 		<?php if ($model->hasErrors()) : ?>
@@ -13,39 +15,46 @@
 				<?php echo $form->errorSummary($model); ?>
 			</div>
 		<?php endif; ?>
+	</div>
 
-		<?php
-		$this->widget('application.components.controls.DropdownField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'dataset_id',
-			'listDataOptions' => [
-				'data' => Util::getDois(),
-				'valueField' => 'id',
-				'textField' => 'identifier',
-			],
-		]);
-		?>
-
-		<?php
-		$this->widget('application.components.controls.DropdownField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'sample_id',
-			'listDataOptions' => [
-				'data' => Sample::model()->findAll(array('limit' => 10000, 'order' => 'id DESC')),
-				'valueField' => 'id',
-				'textField' => 'id',
-			],
-		]);
-		?>
-
+	<?php
+	$this->widget('application.components.controls.DropdownField', [
+		'form' => $form,
+		'model' => $model,
+		'attributeName' => 'dataset_id',
+		'listDataOptions' => [
+			'data' => Util::getDois(),
+			'valueField' => 'id',
+			'textField' => 'identifier',
+		],
+		'groupOptions' => [
+			'class' => 'col-md-6'
+		],
+	]);
+	?>
+
+	<?php
+	$this->widget('application.components.controls.DropdownField', [
+		'form' => $form,
+		'model' => $model,
+		'attributeName' => 'sample_id',
+		'listDataOptions' => [
+			'data' => Sample::model()->findAll(array('limit' => 10000, 'order' => 'id DESC')),
+			'valueField' => 'id',
+			'textField' => 'id',
+		],
+		'groupOptions' => [
+			'class' => 'col-md-6'
+		],
+	]);
+	?>
+
+	<div class="col-md-12">
 		<div class="pull-right btns-row">
-			<a href="/adminDatasetSample/admin" class="btn background-btn-o">Cancel</a>
-			<?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
+			<a href="/adminDatasetSample/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+			<?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
 		</div>
-
-		<?php $this->endWidget(); ?>
 	</div>
 
+	<?php $this->endWidget(); ?>
 </div>
\ No newline at end of file

From 36fd6a7a3277bc858f9e510affe17787e95517d1 Mon Sep 17 00:00:00 2001
From: luis-toptal <luis.martinez@toptal.com>
Date: Sat, 23 Nov 2024 13:58:37 +0700
Subject: [PATCH 07/11] feat: admin dataset project form

---
 protected/views/adminDatasetProject/_form.php | 95 ++++++++++---------
 1 file changed, 52 insertions(+), 43 deletions(-)

diff --git a/protected/views/adminDatasetProject/_form.php b/protected/views/adminDatasetProject/_form.php
index 692fec8232..e92640a908 100644
--- a/protected/views/adminDatasetProject/_form.php
+++ b/protected/views/adminDatasetProject/_form.php
@@ -1,55 +1,64 @@
-<div class="section form row">
+<div class="section form">
+	<?php $form = $this->beginWidget('CActiveForm', array(
+		'id' => 'dataset-project-form',
+		'enableAjaxValidation' => false,
+		'htmlOptions' => [
+			'class' => 'row'
+		]
+	)); ?>
 
-	<div class="col-md-offset-3 col-md-6">
-		<?php $form = $this->beginWidget('CActiveForm', array(
-			'id' => 'dataset-project-form',
-			'enableAjaxValidation' => false,
-		)); ?>
-
-		<?php if ($model->hasErrors()) : ?>
+	<?php if ($model->hasErrors()) : ?>
+		<div class="col-md-12">
 			<div class="alert alert-danger">
 				<?php echo $form->errorSummary($model); ?>
 			</div>
-		<?php endif; ?>
+		</div>
+	<?php endif; ?>
 
-		<?php
-		$this->widget('application.components.controls.DropdownField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'dataset_id',
-			'listDataOptions' => [
-				'data' => Util::getDois(),
-				'valueField' => 'id',
-				'textField' => 'identifier',
-			],
-			'inputOptions' => [
-				'required' => true,
-			],
-		]);
-		?>
+	<?php
+	$this->widget('application.components.controls.DropdownField', [
+		'form' => $form,
+		'model' => $model,
+		'attributeName' => 'dataset_id',
+		'listDataOptions' => [
+			'data' => Util::getDois(),
+			'valueField' => 'id',
+			'textField' => 'identifier',
+		],
+		'inputOptions' => [
+			'required' => true,
+		],
+		'groupOptions' => [
+			'class' => 'col-md-6'
+		],
+	]);
+	?>
 
-		<?php
-		$this->widget('application.components.controls.DropdownField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'project_id',
-			'listDataOptions' => [
-				'data' => Project::model()->findAll(),
-				'valueField' => 'id',
-				'textField' => 'name',
-			],
-			'inputOptions' => [
-				'required' => true,
-			],
-		]);
-		?>
+	<?php
+	$this->widget('application.components.controls.DropdownField', [
+		'form' => $form,
+		'model' => $model,
+		'attributeName' => 'project_id',
+		'listDataOptions' => [
+			'data' => Project::model()->findAll(),
+			'valueField' => 'id',
+			'textField' => 'name',
+		],
+		'inputOptions' => [
+			'required' => true,
+		],
+		'groupOptions' => [
+			'class' => 'col-md-6'
+		],
+	]);
+	?>
 
+	<div class="col-md-12">
 		<div class="pull-right btns-row">
-			<a href="/adminDatasetProject/admin" class="btn background-btn-o">Cancel</a>
-			<?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
+			<a href="/adminDatasetProject/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+			<?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
 		</div>
-
-		<?php $this->endWidget(); ?>
 	</div>
 
+	<?php $this->endWidget(); ?>
 </div>
\ No newline at end of file

From c0d5a1bf9ffc25a52d0e8acd358c797e4ad0f94e Mon Sep 17 00:00:00 2001
From: luis-toptal <luis.martinez@toptal.com>
Date: Sat, 23 Nov 2024 14:49:17 +0700
Subject: [PATCH 08/11] feat: update simple forms layouts

---
 protected/views/adminDatasetSample/_form.php |   4 +-
 protected/views/adminDatasetType/_form.php   |  77 +++---
 protected/views/adminExternalLink/_form.php  | 122 +++++----
 protected/views/adminFileFormat/_form.php    |  78 +++---
 protected/views/adminFileType/_form.php      | 101 ++++----
 protected/views/adminLink/_form.php          | 108 ++++----
 protected/views/adminLinkPrefix/_form.php    | 107 ++++----
 protected/views/adminManuscript/_form.php    | 108 ++++----
 protected/views/adminProject/_form.php       | 104 ++++----
 protected/views/adminPublisher/_form.php     |  88 ++++---
 protected/views/adminRelation/_form.php      | 158 ++++++------
 protected/views/adminSpecies/_form.php       | 138 ++++++-----
 protected/views/attribute/_form.php          | 168 ++++++++-----
 protected/views/datasetFunder/_form.php      | 162 ++++++------
 protected/views/datasetLog/_form.php         | 110 ++++----
 protected/views/funder/_form.php             | 105 ++++----
 protected/views/news/_form.php               | 113 +++++----
 protected/views/report/index.php             | 248 +++++++++----------
 protected/views/rssMessage/_form.php         |  84 ++++---
 19 files changed, 1219 insertions(+), 964 deletions(-)

diff --git a/protected/views/adminDatasetSample/_form.php b/protected/views/adminDatasetSample/_form.php
index 24f94700e8..55818b328e 100644
--- a/protected/views/adminDatasetSample/_form.php
+++ b/protected/views/adminDatasetSample/_form.php
@@ -28,7 +28,7 @@
 			'textField' => 'identifier',
 		],
 		'groupOptions' => [
-			'class' => 'col-md-6'
+			'class' => 'col-md-12'
 		],
 	]);
 	?>
@@ -44,7 +44,7 @@
 			'textField' => 'id',
 		],
 		'groupOptions' => [
-			'class' => 'col-md-6'
+			'class' => 'col-md-12'
 		],
 	]);
 	?>
diff --git a/protected/views/adminDatasetType/_form.php b/protected/views/adminDatasetType/_form.php
index 472b69e6d3..b4a832020d 100644
--- a/protected/views/adminDatasetType/_form.php
+++ b/protected/views/adminDatasetType/_form.php
@@ -1,11 +1,13 @@
-<div class="section form row">
-
-	<div class="col-md-offset-3 col-md-6">
-		<?php $form = $this->beginWidget('CActiveForm', array(
-			'id' => 'type-form',
-			'enableAjaxValidation' => false,
-		)); ?>
-
+<div class="section form">
+	<?php $form = $this->beginWidget('CActiveForm', array(
+		'id' => 'type-form',
+		'enableAjaxValidation' => false,
+		'htmlOptions' => [
+			'class' => 'row'
+		]
+	)); ?>
+
+	<div class="col-md-12">
 		<p class="note">Fields with <span class="required">*</span> are required.</p>
 
 		<?php if ($model->hasErrors()) : ?>
@@ -13,35 +15,42 @@
 				<?php echo $form->errorSummary($model); ?>
 			</div>
 		<?php endif; ?>
+	</div>
 
-		<?php
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'name',
-			'inputOptions' => [
-				'required' => true,
-				'maxlength' => 32
-			],
-		]);
-
-		$this->widget('application.components.controls.TextArea', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'description',
-			'inputOptions' => [
-				'rows' => 6,
-				'cols' => 50
-			],
-		]);
-		?>
-
+	<?php
+	$this->widget('application.components.controls.TextField', [
+		'form' => $form,
+		'model' => $model,
+		'attributeName' => 'name',
+		'inputOptions' => [
+			'required' => true,
+			'maxlength' => 32
+		],
+		'groupOptions' => [
+			'class' => 'col-md-12'
+		]
+	]);
+
+	$this->widget('application.components.controls.TextArea', [
+		'form' => $form,
+		'model' => $model,
+		'attributeName' => 'description',
+		'inputOptions' => [
+			'rows' => 6,
+			'cols' => 50
+		],
+		'groupOptions' => [
+			'class' => 'col-md-12'
+		]
+	]);
+	?>
+
+	<div class="col-md-12">
 		<div class="pull-right btns-row">
-			<a href="/adminDatasetType/admin" class="btn background-btn-o">Cancel</a>
-			<?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
+			<a href="/adminDatasetType/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+			<?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
 		</div>
-
-		<?php $this->endWidget(); ?>
 	</div>
 
+	<?php $this->endWidget(); ?>
 </div>
\ No newline at end of file
diff --git a/protected/views/adminExternalLink/_form.php b/protected/views/adminExternalLink/_form.php
index ef75d64424..dc13c3fe29 100644
--- a/protected/views/adminExternalLink/_form.php
+++ b/protected/views/adminExternalLink/_form.php
@@ -1,62 +1,76 @@
-<div class="section form row">
+<div class="section form">
+  <?php $form = $this->beginWidget('CActiveForm', array(
+    'id' => 'external-link-form',
+    'enableAjaxValidation' => false,
+    'htmlOptions' => [
+      'class' => 'row'
+    ]
+  )); ?>
 
-	<div class="col-md-offset-3 col-md-6">
-		<?php $form = $this->beginWidget('CActiveForm', array(
-			'id' => 'external-link-form',
-			'enableAjaxValidation' => false,
-		)); ?>
+  <div class="col-md-12">
+    <p class="note">Fields with <span class="required">*</span> are required.</p>
 
-		<p class="note">Fields with <span class="required">*</span> are required.</p>
+    <?php if ($model->hasErrors()): ?>
+      <div class="alert alert-danger">
+        <?php echo $form->errorSummary($model); ?>
+      </div>
+    <?php endif; ?>
+  </div>
 
-		<?php if ($model->hasErrors()) : ?>
-			<div class="alert alert-danger">
-				<?php echo $form->errorSummary($model); ?>
-			</div>
-		<?php endif; ?>
+  <?php
+  $this->widget('application.components.controls.DropdownField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'dataset_id',
+    'listDataOptions' => [
+      'data' => Dataset::model()->findAll(),
+      'valueField' => 'id',
+      'textField' => 'identifier',
+    ],
+    'inputOptions' => [
+      'required' => true,
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-6'
+    ],
+  ]);
 
-		<?php
-		$this->widget('application.components.controls.DropdownField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'dataset_id',
-			'listDataOptions' => [
-				'data' => Dataset::model()->findAll(),
-				'valueField' => 'id',
-				'textField' => 'identifier',
-			],
-			'inputOptions' => [
-				'required' => true,
-			],
-		]);
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'url',
-			'inputOptions' => [
-				'required' => true,
-			],
-		]);
-		$this->widget('application.components.controls.DropdownField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'external_link_type_id',
-			'listDataOptions' => [
-				'data' => ExternalLinkType::model()->findAll(),
-				'valueField' => 'id',
-				'textField' => 'name',
-			],
-			'inputOptions' => [
-				'required' => true,
-			],
-		]);
-		?>
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'url',
+    'inputOptions' => [
+      'required' => true,
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-6'
+    ],
+  ]);
 
-		<div class="pull-right btns-row">
-			<a href="/adminExternalLink/admin" class="btn background-btn-o">Cancel</a>
-			<?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
-		</div>
+  $this->widget('application.components.controls.DropdownField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'external_link_type_id',
+    'listDataOptions' => [
+      'data' => ExternalLinkType::model()->findAll(),
+      'valueField' => 'id',
+      'textField' => 'name',
+    ],
+    'inputOptions' => [
+      'required' => true,
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ],
+  ]);
+  ?>
 
-		<?php $this->endWidget(); ?>
-	</div>
+  <div class="col-md-12">
+    <div class="pull-right btns-row">
+      <a href="/adminExternalLink/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+      <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
+    </div>
+  </div>
 
+  <?php $this->endWidget(); ?>
 </div>
\ No newline at end of file
diff --git a/protected/views/adminFileFormat/_form.php b/protected/views/adminFileFormat/_form.php
index 70f7e10e63..ef52d44191 100644
--- a/protected/views/adminFileFormat/_form.php
+++ b/protected/views/adminFileFormat/_form.php
@@ -1,46 +1,56 @@
-<div class="section form row">
-
-  <div class="col-md-offset-3 col-md-6">
-    <?php $form = $this->beginWidget('CActiveForm', array(
-      'id' => 'file-format-form',
-      'enableAjaxValidation' => false,
-    )); ?>
+<div class="section form">
+  <?php $form = $this->beginWidget('CActiveForm', array(
+    'id' => 'file-format-form',
+    'enableAjaxValidation' => false,
+    'htmlOptions' => [
+      'class' => 'row'
+    ]
+  )); ?>
 
+  <div class="col-md-12">
     <p class="note">Fields with <span class="required">*</span> are required.</p>
 
     <?php if ($model->hasErrors()) : ?>
-        <div class="alert alert-danger">
-          <?php echo $form->errorSummary($model); ?>
-        </div>
+      <div class="alert alert-danger">
+        <?php echo $form->errorSummary($model); ?>
+      </div>
     <?php endif; ?>
+  </div>
 
-    <?php
-    $this->widget('application.components.controls.TextField', [
-      'form' => $form,
-      'model' => $model,
-      'attributeName' => 'name',
-      'inputOptions' => [
-        'required' => true,
-        'maxlength' => 10
-      ],
-    ]);
-    $this->widget('application.components.controls.TextArea', [
-      'form' => $form,
-      'model' => $model,
-      'attributeName' => 'description',
-      'inputOptions' => [
-        'rows' => 6,
-        'cols' => 50
-      ],
-    ]);
-    ?>
+  <?php
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'name',
+    'inputOptions' => [
+      'required' => true,
+      'maxlength' => 10
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ]
+  ]);
 
+  $this->widget('application.components.controls.TextArea', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'description',
+    'inputOptions' => [
+      'rows' => 6,
+      'cols' => 50
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ]
+  ]);
+  ?>
+
+  <div class="col-md-12">
     <div class="pull-right btns-row">
-      <a href="/adminFileFormat/admin" class="btn background-btn-o">Cancel</a>
-      <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
+      <a href="/adminFileFormat/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+      <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
     </div>
-
-    <?php $this->endWidget(); ?>
   </div>
 
+  <?php $this->endWidget(); ?>
 </div>
\ No newline at end of file
diff --git a/protected/views/adminFileType/_form.php b/protected/views/adminFileType/_form.php
index a02a413429..d0eae6bf9e 100644
--- a/protected/views/adminFileType/_form.php
+++ b/protected/views/adminFileType/_form.php
@@ -1,47 +1,56 @@
-<div class="section form row">
-
-	<div class="col-md-offset-3 col-md-6">
-		<?php $form = $this->beginWidget('CActiveForm', array(
-			'id' => 'file-type-form',
-			'enableAjaxValidation' => false,
-		)); ?>
-
-		<p class="note">Fields with <span class="required">*</span> are required.</p>
-
-		<?php if ($model->hasErrors()) : ?>
-			<div class="alert alert-danger">
-				<?php echo $form->errorSummary($model); ?>
-			</div>
-		<?php endif; ?>
-
-		<?php
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'name',
-			'inputOptions' => [
-				'required' => true,
-				'maxlength' => 100
-			],
-		]);
-
-		$this->widget('application.components.controls.TextArea', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'description',
-			'inputOptions' => [
-				'rows' => 6,
-				'cols' => 50
-			],
-		]);
-		?>
-
-		<div class="pull-right btns-row">
-			<a href="/adminFileType/admin" class="btn background-btn-o">Cancel</a>
-			<?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
-		</div>
-
-		<?php $this->endWidget(); ?>
-	</div>
-
+<div class="section form">
+  <?php $form = $this->beginWidget('CActiveForm', array(
+    'id' => 'file-type-form',
+    'enableAjaxValidation' => false,
+    'htmlOptions' => [
+      'class' => 'row'
+    ]
+  )); ?>
+
+  <div class="col-md-12">
+    <p class="note">Fields with <span class="required">*</span> are required.</p>
+
+    <?php if ($model->hasErrors()): ?>
+      <div class="alert alert-danger">
+        <?php echo $form->errorSummary($model); ?>
+      </div>
+    <?php endif; ?>
+  </div>
+
+  <?php
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'name',
+    'inputOptions' => [
+      'required' => true,
+      'maxlength' => 100
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ],
+  ]);
+
+  $this->widget('application.components.controls.TextArea', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'description',
+    'inputOptions' => [
+      'rows' => 6,
+      'cols' => 50
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ],
+  ]);
+  ?>
+
+  <div class="col-md-12">
+    <div class="pull-right btns-row">
+      <a href="/adminFileType/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+      <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
+    </div>
+  </div>
+
+  <?php $this->endWidget(); ?>
 </div>
\ No newline at end of file
diff --git a/protected/views/adminLink/_form.php b/protected/views/adminLink/_form.php
index fcb66a85fa..d0032f89c5 100644
--- a/protected/views/adminLink/_form.php
+++ b/protected/views/adminLink/_form.php
@@ -1,55 +1,67 @@
-<div class="section form row">
+<?php $form = $this->beginWidget('CActiveForm', array(
+    'id' => 'link-form',
+    'enableAjaxValidation' => false,
+    'htmlOptions' => [
+        'class' => 'row'
+    ]
+)); ?>
 
-	<div class="col-md-offset-3 col-md-6">
-		<?php $form = $this->beginWidget('CActiveForm', array(
-			'id' => 'link-form',
-			'enableAjaxValidation' => false,
-		)); ?>
+<div class="col-md-12">
+    <p class="note">Fields with <span class="required">*</span> are required.</p>
 
-		<p class="note">Fields with <span class="required">*</span> are required.</p>
+    <?php if ($model->hasErrors()) : ?>
+        <div class="alert alert-danger">
+            <?php echo $form->errorSummary($model); ?>
+        </div>
+    <?php endif; ?>
+</div>
 
-		<?php if ($model->hasErrors()) : ?>
-			<div class="alert alert-danger">
-				<?php echo $form->errorSummary($model); ?>
-			</div>
-		<?php endif; ?>
+<?php
+$this->widget('application.components.controls.DropdownField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'dataset_id',
+    'listDataOptions' => [
+        'data' => Util::getDois(),
+        'valueField' => 'id',
+        'textField' => 'identifier',
+    ],
+    'inputOptions' => [
+        'required' => true,
+    ],
+    'groupOptions' => [
+        'class' => 'col-md-12'
+    ],
+]);
 
-		<?php
-		$this->widget('application.components.controls.DropdownField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'dataset_id',
-			'listDataOptions' => [
-				'data' => Util::getDois(),
-				'valueField' => 'id',
-				'textField' => 'identifier',
-			],
-			'inputOptions' => [
-				'required' => true,
-			],
-		]);
-		$this->widget('application.components.controls.CheckBoxField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'is_primary',
-		]);
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'link',
-			'inputOptions' => [
-				'required' => true,
-				'maxlength' => 100
-			],
-		]);
-		?>
+$this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'link',
+    'inputOptions' => [
+        'required' => true,
+        'maxlength' => 100
+    ],
+    'groupOptions' => [
+        'class' => 'col-md-12'
+    ],
+]);
 
-		<div class="pull-right btns-row">
-			<a href="/adminLink/admin" class="btn background-btn-o">Cancel</a>
-			<?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
-		</div>
+$this->widget('application.components.controls.CheckBoxField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'is_primary',
+    'groupOptions' => [
+        'class' => 'col-md-12'
+    ],
+]);
+?>
 
-		<?php $this->endWidget(); ?>
-	</div>
+<div class="col-md-12">
+    <div class="pull-right btns-row">
+        <a href="/adminLink/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+        <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
+    </div>
+</div>
 
-</div>
\ No newline at end of file
+<?php $this->endWidget(); ?>
\ No newline at end of file
diff --git a/protected/views/adminLinkPrefix/_form.php b/protected/views/adminLinkPrefix/_form.php
index f300a61cd2..d184746d44 100644
--- a/protected/views/adminLinkPrefix/_form.php
+++ b/protected/views/adminLinkPrefix/_form.php
@@ -1,56 +1,69 @@
-<div class="section form row">
+<div class="section form">
+  <?php $form = $this->beginWidget('CActiveForm', array(
+    'id' => 'prefix-form',
+    'enableAjaxValidation' => false,
+    'htmlOptions' => [
+      'class' => 'row'
+    ]
+  )); ?>
 
-    <div class="col-md-offset-3 col-md-6">
-        <?php $form = $this->beginWidget('CActiveForm', array(
-            'id' => 'prefix-form',
-            'enableAjaxValidation' => false,
-        )); ?>
+  <div class="col-md-12">
+    <p class="note">Fields with <span class="required">*</span> are required.</p>
 
-        <p class="note">Fields with <span class="required">*</span> are required.</p>
+    <?php if ($model->hasErrors()): ?>
+      <div class="alert alert-danger">
+        <?php echo $form->errorSummary($model); ?>
+      </div>
+    <?php endif; ?>
+  </div>
 
-        <?php if ($model->hasErrors()) : ?>
-            <div class="alert alert-danger">
-                <?php echo $form->errorSummary($model); ?>
-            </div>
-        <?php endif; ?>
+  <?php
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'prefix',
+    'inputOptions' => [
+      'required' => true,
+      'maxlength' => 20
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-6'
+    ],
+  ]);
 
+  $this->widget('application.components.controls.DropdownField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'source',
+    'dataset' => array('EBI' => 'EBI', 'NCBI' => 'NCBI', 'DDBJ' => 'DDBJ'),
+    'inputOptions' => [
+      'required' => true,
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-6'
+    ],
+  ]);
 
-        <?php
-        $this->widget('application.components.controls.TextField', [
-            'form' => $form,
-            'model' => $model,
-            'attributeName' => 'prefix',
-            'inputOptions' => [
-                'required' => true,
-                'maxlength' => 20
-            ],
-        ]);
-        $this->widget('application.components.controls.DropdownField', [
-            'form' => $form,
-            'model' => $model,
-            'attributeName' => 'source',
-            'dataset' => array('EBI' => 'EBI', 'NCBI' => 'NCBI', 'DDBJ' => 'DDBJ'),
-            'inputOptions' => [
-                'required' => true,
-            ],
-        ]);
-        $this->widget('application.components.controls.TextArea', [
-            'form' => $form,
-            'model' => $model,
-            'attributeName' => 'url',
-            'inputOptions' => [
-                'rows' => 3,
-                'cols' => 50
-            ],
-        ]);
-        ?>
+  $this->widget('application.components.controls.TextArea', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'url',
+    'inputOptions' => [
+      'rows' => 3,
+      'cols' => 50
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ],
+  ]);
+  ?>
 
-        <div class="pull-right btns-row">
-            <a href="/adminLinkPrefix/admin" class="btn background-btn-o">Cancel</a>
-            <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
-        </div>
-
-        <?php $this->endWidget(); ?>
+  <div class="col-md-12">
+    <div class="pull-right btns-row">
+      <a href="/adminLinkPrefix/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+      <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
     </div>
+  </div>
 
+  <?php $this->endWidget(); ?>
 </div>
\ No newline at end of file
diff --git a/protected/views/adminManuscript/_form.php b/protected/views/adminManuscript/_form.php
index 3157c9e7c0..fde37fb17c 100644
--- a/protected/views/adminManuscript/_form.php
+++ b/protected/views/adminManuscript/_form.php
@@ -1,55 +1,69 @@
-<div class="section form row">
+<div class="section form">
+  <?php $form = $this->beginWidget('CActiveForm', array(
+    'id' => 'manuscript-form',
+    'enableAjaxValidation' => false,
+    'htmlOptions' => [
+      'class' => 'row'
+    ]
+  )); ?>
 
-	<div class="col-md-offset-3 col-md-6">
-		<?php $form = $this->beginWidget('CActiveForm', array(
-			'id' => 'manuscript-form',
-			'enableAjaxValidation' => false,
-		)); ?>
+  <div class="col-md-12">
+    <p class="note">Fields with <span class="required">*</span> are required.</p>
 
-		<p class="note">Fields with <span class="required">*</span> are required.</p>
+    <?php if ($model->hasErrors()): ?>
+      <div class="alert alert-danger">
+        <?php echo $form->errorSummary($model); ?>
+      </div>
+    <?php endif; ?>
+  </div>
 
-		<?php if ($model->hasErrors()) : ?>
-			<div class="alert alert-danger">
-				<?php echo $form->errorSummary($model); ?>
-			</div>
-		<?php endif; ?>
+  <?php
+  $this->widget('application.components.controls.DropdownField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'dataset_id',
+    'listDataOptions' => [
+      'data' => Util::getDois(),
+      'valueField' => 'id',
+      'textField' => 'identifier',
+    ],
+    'inputOptions' => [
+      'required' => true,
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-6'
+    ],
+  ]);
 
-		<?php
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'identifier',
-			'inputOptions' => [
-				'required' => true,
-				'maxlength' => 32
-			],
-		]);
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'pmid',
-		]);
-		$this->widget('application.components.controls.DropdownField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'dataset_id',
-			'listDataOptions' => [
-				'data' => Util::getDois(),
-				'valueField' => 'id',
-				'textField' => 'identifier',
-			],
-			'inputOptions' => [
-				'required' => true,
-			],
-		]);
-		?>
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'identifier',
+    'inputOptions' => [
+      'required' => true,
+      'maxlength' => 32
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-6'
+    ],
+  ]);
 
-		<div class="pull-right btns-row">
-			<a href="/adminManuscript/admin" class="btn background-btn-o">Cancel</a>
-			<?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
-		</div>
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'pmid',
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ],
+  ]);
+  ?>
 
-		<?php $this->endWidget(); ?>
-	</div>
+  <div class="col-md-12">
+    <div class="pull-right btns-row">
+      <a href="/adminManuscript/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+      <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
+    </div>
+  </div>
 
+  <?php $this->endWidget(); ?>
 </div>
\ No newline at end of file
diff --git a/protected/views/adminProject/_form.php b/protected/views/adminProject/_form.php
index 45b65af3e5..7337c76216 100644
--- a/protected/views/adminProject/_form.php
+++ b/protected/views/adminProject/_form.php
@@ -1,53 +1,67 @@
-<div class="section form row">
+<div class="section form">
+  <?php $form = $this->beginWidget('CActiveForm', array(
+    'id' => 'project-form',
+    'enableAjaxValidation' => false,
+    'htmlOptions' => [
+      'class' => 'row'
+    ]
+  )); ?>
 
-	<div class="col-md-offset-3 col-md-6">
-		<?php $form = $this->beginWidget('CActiveForm', array(
-			'id' => 'project-form',
-			'enableAjaxValidation' => false,
-		)); ?>
+  <div class="col-md-12">
+    <p class="note">Fields with <span class="required">*</span> are required.</p>
 
-		<p class="note">Fields with <span class="required">*</span> are required.</p>
+    <?php if ($model->hasErrors()): ?>
+      <div class="alert alert-danger">
+        <?php echo $form->errorSummary($model); ?>
+      </div>
+    <?php endif; ?>
+  </div>
 
-		<?php if ($model->hasErrors()) : ?>
-			<div class="alert alert-danger">
-				<?php echo $form->errorSummary($model); ?>
-			</div>
-		<?php endif; ?>
+  <?php
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'url',
+    'inputOptions' => [
+      'required' => true,
+      'maxlength' => 128
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-6'
+    ],
+  ]);
 
-		<?php
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'url',
-			'inputOptions' => [
-				'required' => true,
-				'maxlength' => 128
-			],
-		]);
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'name',
-			'inputOptions' => [
-				'maxlength' => 255
-			]
-		]);
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'image_location',
-			'inputOptions' => [
-				'maxlength' => 100
-			]
-		]);
-		?>
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'name',
+    'inputOptions' => [
+      'maxlength' => 255
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-6'
+    ],
+  ]);
 
-		<div class="pull-right btns-row">
-			<a href="/adminProject/admin" class="btn background-btn-o">Cancel</a>
-			<?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
-		</div>
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'image_location',
+    'inputOptions' => [
+      'maxlength' => 100
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ],
+  ]);
+  ?>
 
-		<?php $this->endWidget(); ?>
-	</div>
+  <div class="col-md-12">
+    <div class="pull-right btns-row">
+      <a href="/adminProject/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+      <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
+    </div>
+  </div>
 
+  <?php $this->endWidget(); ?>
 </div>
\ No newline at end of file
diff --git a/protected/views/adminPublisher/_form.php b/protected/views/adminPublisher/_form.php
index 2dda0c41e7..01c119c031 100644
--- a/protected/views/adminPublisher/_form.php
+++ b/protected/views/adminPublisher/_form.php
@@ -1,46 +1,56 @@
-<div class="section form row">
+<div class="section form">
+  <?php $form = $this->beginWidget('CActiveForm', array(
+    'id' => 'publisher-form',
+    'enableAjaxValidation' => false,
+    'htmlOptions' => [
+      'class' => 'row'
+    ]
+  )); ?>
 
-	<div class="col-md-offset-3 col-md-6">
-		<?php $form = $this->beginWidget('CActiveForm', array(
-			'id' => 'publisher-form',
-			'enableAjaxValidation' => false,
-		)); ?>
+  <div class="col-md-12">
+    <p class="note">Fields with <span class="required">*</span> are required.</p>
 
-		<p class="note">Fields with <span class="required">*</span> are required.</p>
+    <?php if ($model->hasErrors()): ?>
+      <div class="alert alert-danger">
+        <?php echo $form->errorSummary($model); ?>
+      </div>
+    <?php endif; ?>
+  </div>
 
-		<?php if ($model->hasErrors()) : ?>
-			<div class="alert alert-danger">
-				<?php echo $form->errorSummary($model); ?>
-			</div>
-		<?php endif; ?>
+  <?php
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'name',
+    'inputOptions' => [
+      'required' => true,
+      'maxlength' => 45
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ],
+  ]);
 
-		<?php
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'name',
-			'inputOptions' => [
-				'required' => true,
-				'maxlength' => 45
-			],
-		]);
-		$this->widget('application.components.controls.TextArea', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'description',
-			'inputOptions' => [
-				'rows' => 6,
-				'cols' => 50
-			],
-		]);
-		?>
+  $this->widget('application.components.controls.TextArea', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'description',
+    'inputOptions' => [
+      'rows' => 6,
+      'cols' => 50
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ],
+  ]);
+  ?>
 
-		<div class="pull-right btns-row">
-			<a href="/adminPublisher/admin" class="btn background-btn-o">Cancel</a>
-			<?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
-		</div>
-
-		<?php $this->endWidget(); ?>
-	</div>
+  <div class="col-md-12">
+    <div class="pull-right btns-row">
+      <a href="/adminPublisher/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+      <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
+    </div>
+  </div>
 
+  <?php $this->endWidget(); ?>
 </div>
\ No newline at end of file
diff --git a/protected/views/adminRelation/_form.php b/protected/views/adminRelation/_form.php
index b3e91f44c9..cdef4c0931 100644
--- a/protected/views/adminRelation/_form.php
+++ b/protected/views/adminRelation/_form.php
@@ -1,78 +1,98 @@
-<div class="section form row">
+<?php $form = $this->beginWidget('CActiveForm', array(
+  'id' => 'relation-form',
+  'enableAjaxValidation' => false,
+  'htmlOptions' => [
+    'class' => 'row'
+  ]
+)); ?>
 
-	<div class="col-md-offset-3 col-md-6">
-		<?php $form = $this->beginWidget('CActiveForm', array(
-			'id' => 'relation-form',
-			'enableAjaxValidation' => false,
-		)); ?>
+<?php if (Yii::app()->user->hasFlash('error') || $model->hasErrors()): ?>
+  <div class="col-md-12">
+    <?php if (Yii::app()->user->hasFlash('error')): ?>
+      <div class="alert alert-danger">
+        <?php echo Yii::app()->user->getFlash('error'); ?>
+      </div>
+    <?php endif; ?>
 
-		<p class="note">Fields with <span class="required">*</span> are required.</p>
+    <?php if ($model->hasErrors()): ?>
+      <div class="alert alert-danger">
+        <?php echo $form->errorSummary($model); ?>
+      </div>
+    <?php endif; ?>
+  </div>
+<?php endif; ?>
 
-        <?php if(Yii::app()->user->hasFlash('error')):?>
-            <div class="alert alert-danger">
-                <?php echo Yii::app()->user->getFlash('error'); ?>
-            </div>
-        <?php endif; ?>
+<div class="col-md-12">
+  <p class="note">Fields with <span class="required">*</span> are required.</p>
+</div>
 
-		<?php if ($model->hasErrors()) : ?>
-			<div class="alert alert-danger">
-				<?php echo $form->errorSummary($model); ?>
-			</div>
-		<?php endif; ?>
+<?php
+$this->widget('application.components.controls.DropdownField', [
+  'form' => $form,
+  'model' => $model,
+  'attributeName' => 'dataset_id',
+  'listDataOptions' => [
+    'data' => Util::getDois(),
+    'valueField' => 'id',
+    'textField' => 'identifier',
+  ],
+  'inputOptions' => [
+    'required' => true,
+  ],
+  'groupOptions' => [
+    'class' => 'col-md-6'
+  ],
+]);
 
-		<?php
-		$this->widget('application.components.controls.DropdownField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'dataset_id',
-			'listDataOptions' => [
-				'data' => Util::getDois(),
-				'valueField' => 'id',
-				'textField' => 'identifier',
-			],
-			'inputOptions' => [
-				'required' => true,
-			],
-		]);
-		$this->widget('application.components.controls.DropdownField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'related_doi',
-			'listDataOptions' => [
-				'data' => Util::getDois(),
-				'valueField' => 'identifier',
-				'textField' => 'identifier',
-			],
-			'inputOptions' => [
-				'required' => true,
-			],
-		]);
-		$this->widget('application.components.controls.DropdownField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'relationship_id',
-			'listDataOptions' => [
-				'data' => Relationship::model()->findAll(),
-				'valueField' => 'id',
-				'textField' => 'name',
-			],
-		]);
-        if ('insert' === $model->getScenario()) {
-            $this->widget('application.components.controls.CheckBoxField', [
-                'form' => $form,
-                'model' => $model,
-                'attributeName' => 'add_reciprocal',
-                'label' => 'Do you want to add a reciprocal relation model'
-            ]);
-        }
-		?>
+$this->widget('application.components.controls.DropdownField', [
+  'form' => $form,
+  'model' => $model,
+  'attributeName' => 'related_doi',
+  'listDataOptions' => [
+    'data' => Util::getDois(),
+    'valueField' => 'identifier',
+    'textField' => 'identifier',
+  ],
+  'inputOptions' => [
+    'required' => true,
+  ],
+  'groupOptions' => [
+    'class' => 'col-md-6'
+  ],
+]);
 
-		<div class="pull-right btns-row">
-			<a href="/adminRelation/admin" class="btn background-btn-o">Cancel</a>
-			<?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
-		</div>
+$this->widget('application.components.controls.DropdownField', [
+  'form' => $form,
+  'model' => $model,
+  'attributeName' => 'relationship_id',
+  'listDataOptions' => [
+    'data' => Relationship::model()->findAll(),
+    'valueField' => 'id',
+    'textField' => 'name',
+  ],
+  'groupOptions' => [
+    'class' => 'col-md-12'
+  ],
+]);
 
-		<?php $this->endWidget(); ?>
-	</div>
+if ('insert' === $model->getScenario()) {
+  $this->widget('application.components.controls.CheckBoxField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'add_reciprocal',
+    'label' => 'Do you want to add a reciprocal relation model',
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ],
+  ]);
+}
+?>
 
+<div class="col-md-12">
+  <div class="pull-right btns-row">
+    <a href="/adminRelation/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+    <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
+  </div>
 </div>
+
+<?php $this->endWidget(); ?>
\ No newline at end of file
diff --git a/protected/views/adminSpecies/_form.php b/protected/views/adminSpecies/_form.php
index 21768eb8d0..259cb57614 100644
--- a/protected/views/adminSpecies/_form.php
+++ b/protected/views/adminSpecies/_form.php
@@ -1,62 +1,80 @@
-<div class="section form row">
-
-	<div class="col-md-offset-3 col-md-6">
-		<?php $form = $this->beginWidget('CActiveForm', array(
-			'id' => 'species-form',
-			'enableAjaxValidation' => false,
-		)); ?>
-
-		<p class="note">Fields with <span class="required">*</span> are required.</p>
-
-		<?php if ($model->hasErrors()) : ?>
-			<div class="alert alert-danger">
-				<?php echo $form->errorSummary($model); ?>
-			</div>
-		<?php endif; ?>
-
-		<?php
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'tax_id',
-			'inputOptions' => [
-				'required' => true,
-			],
-		]);
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'common_name',
-			'inputOptions' => [
-				'required' => true,
-				'maxlength' => 64
-			],
-		]);
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'genbank_name',
-			'inputOptions' => [
-				'maxlength' => 128
-			],
-		]);
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'scientific_name',
-			'inputOptions' => [
-				'required' => true,
-				'maxlength' => 128
-			],
-		]);
-		?>
-
-		<div class="pull-right btns-row">
-			<a href="/adminSpecies/admin" class="btn background-btn-o">Cancel</a>
-			<?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
-		</div>
-
-		<?php $this->endWidget(); ?>
-	</div>
+<div class="section form">
+  <?php $form = $this->beginWidget('CActiveForm', array(
+    'id' => 'species-form',
+    'enableAjaxValidation' => false,
+    'htmlOptions' => [
+      'class' => 'row'
+    ]
+  )); ?>
 
+  <div class="col-md-12">
+    <p class="note">Fields with <span class="required">*</span> are required.</p>
+
+    <?php if ($model->hasErrors()): ?>
+      <div class="alert alert-danger">
+        <?php echo $form->errorSummary($model); ?>
+      </div>
+    <?php endif; ?>
+  </div>
+
+  <?php
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'tax_id',
+    'inputOptions' => [
+      'required' => true,
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-6'
+    ],
+  ]);
+
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'common_name',
+    'inputOptions' => [
+      'required' => true,
+      'maxlength' => 64
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-6'
+    ],
+  ]);
+
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'scientific_name',
+    'inputOptions' => [
+      'required' => true,
+      'maxlength' => 128
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ],
+  ]);
+
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'genbank_name',
+    'inputOptions' => [
+      'maxlength' => 128
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ],
+  ]);
+  ?>
+
+  <div class="col-md-12">
+    <div class="pull-right btns-row">
+      <a href="/adminSpecies/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+      <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
+    </div>
+  </div>
+
+  <?php $this->endWidget(); ?>
 </div>
\ No newline at end of file
diff --git a/protected/views/attribute/_form.php b/protected/views/attribute/_form.php
index be17f79c7b..676c330eec 100644
--- a/protected/views/attribute/_form.php
+++ b/protected/views/attribute/_form.php
@@ -1,71 +1,111 @@
-<div class="section form row">
+<div class="section form">
+  <?php $form = $this->beginWidget('CActiveForm', array(
+    'id' => 'attribute-form',
+    'enableAjaxValidation' => false,
+    'htmlOptions' => [
+      'class' => 'row'
+    ]
+  )); ?>
 
-	<div class="col-md-offset-3 col-md-6">
-		<?php $form = $this->beginWidget('CActiveForm', array(
-			'id' => 'attribute-form',
-			'enableAjaxValidation' => false,
-		)); ?>
+  <div class="col-md-12">
+    <p class="note">Fields with <span class="required">*</span> are required.</p>
 
-		<?php if ($model->hasErrors()) : ?>
-			<div class="alert alert-danger">
-				<?php echo $form->errorSummary($model); ?>
-			</div>
-		<?php endif; ?>
+    <?php if ($model->hasErrors()): ?>
+      <div class="alert alert-danger">
+        <?php echo $form->errorSummary($model); ?>
+      </div>
+    <?php endif; ?>
+  </div>
 
-		<?php
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'attribute_name',
-		]);
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'definition',
-		]);
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'model',
-		]);
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'structured_comment_name',
-		]);
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'value_syntax',
-		]);
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'allowed_units',
-		]);
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'occurance',
-		]);
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'ontology_link',
-		]);
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'note',
-		]);
-		?>
+  <?php
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'attribute_name',
+    'groupOptions' => [
+      'class' => 'col-md-6'
+    ],
+  ]);
 
-		<div class="pull-right btns-row">
-			<a href="/attribute/admin" class="btn background-btn-o">Cancel</a>
-			<?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
-		</div>
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'model',
+    'groupOptions' => [
+      'class' => 'col-md-6'
+    ],
+  ]);
 
-		<?php $this->endWidget(); ?>
-	</div>
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'definition',
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ],
+  ]);
 
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'structured_comment_name',
+    'groupOptions' => [
+      'class' => 'col-md-6'
+    ],
+  ]);
+
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'value_syntax',
+    'groupOptions' => [
+      'class' => 'col-md-6'
+    ],
+  ]);
+
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'allowed_units',
+    'groupOptions' => [
+      'class' => 'col-md-4'
+    ],
+  ]);
+
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'occurance',
+    'groupOptions' => [
+      'class' => 'col-md-4'
+    ],
+  ]);
+
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'ontology_link',
+    'groupOptions' => [
+      'class' => 'col-md-4'
+    ],
+  ]);
+
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'note',
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ],
+  ]);
+  ?>
+
+  <div class="col-md-12">
+    <div class="pull-right btns-row">
+      <a href="/attribute/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+      <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
+    </div>
+  </div>
+
+  <?php $this->endWidget(); ?>
 </div>
\ No newline at end of file
diff --git a/protected/views/datasetFunder/_form.php b/protected/views/datasetFunder/_form.php
index 8b0fd39794..3643de9388 100644
--- a/protected/views/datasetFunder/_form.php
+++ b/protected/views/datasetFunder/_form.php
@@ -1,78 +1,100 @@
-<div class="section form row">
+<div class="section form">
+  <?php $form = $this->beginWidget('CActiveForm', array(
+    'id' => 'dataset-funder-form',
+    'enableAjaxValidation' => false,
+    'htmlOptions' => [
+      'class' => 'row'
+    ]
+  )); ?>
 
-	<div class="col-md-offset-3 col-md-6">
-		<?php $form = $this->beginWidget('CActiveForm', array(
-			'id' => 'dataset-funder-form',
-			'enableAjaxValidation' => false,
-		)); ?>
+  <div class="col-md-12">
+    <p class="note">Fields with <span class="required">*</span> are required.</p>
 
-		<p class="note">Fields with <span class="required">*</span> are required.</p>
+    <?php if ($model->hasErrors()): ?>
+      <div class="alert alert-danger">
+        <?php echo $form->errorSummary($model); ?>
+      </div>
+    <?php endif; ?>
+  </div>
 
-		<?php if ($model->hasErrors()) : ?>
-			<div class="alert alert-danger">
-				<?php echo $form->errorSummary($model); ?>
-			</div>
-		<?php endif; ?>
+  <?php
+  $this->widget('application.components.controls.DropdownField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'dataset_id',
+    'dataset' => $datasets,
+    'inputOptions' => [
+      'required' => true,
+    ],
+    'tooltip' => 'Select or type the relevant Dataset DOI ID',
+    'groupOptions' => [
+      'class' => 'col-md-6'
+    ]
+  ]);
 
-		<?php
-		$this->widget('application.components.controls.DropdownField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'dataset_id',
-			'dataset' => $datasets,
-			'inputOptions' => [
-				'required' => true,
-			],
-      'tooltip' => 'Select or type the relevant Dataset DOI ID'
-		]);
-		$this->widget('application.components.controls.DropdownField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'funder_id',
-			'dataset' => $funders,
-			'inputOptions' => [
-				'required' => true,
-			],
-      'tooltip' => 'Select the Funder name from the drop-down list. If the name is not present, it will need to be added via the Funder Admin page'
-		]);
-		$this->widget('application.components.controls.TextArea', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'grant_award',
-			'inputOptions' => [
-				'rows' => 6,
-				'cols' => 50
-			],
-      'tooltip' => 'Type the Grant/Award ID provided by the submitter'
-		]);
-		$this->widget('application.components.controls.TextArea', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'awardee',
-			'inputOptions' => [
-				'rows' => 6,
-				'cols' => 50
-			],
-      'tooltip' => 'Insert the Principle Investigators name who was awarded the grant, use format Initials Surname e.g. CI Hunter'
-		]);
-		$this->widget('application.components.controls.TextArea', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'comments',
-			'inputOptions' => [
-				'rows' => 6,
-				'cols' => 50
-			],
-      'tooltip' => 'Use this field to include a program name if the award was part of a specific program, or other short details as required'
-		]);
-		?>
+  $this->widget('application.components.controls.DropdownField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'funder_id',
+    'dataset' => $funders,
+    'inputOptions' => [
+      'required' => true,
+    ],
+    'tooltip' => 'Select the Funder name from the drop-down list. If the name is not present, it will need to be added via the Funder Admin page',
+    'groupOptions' => [
+      'class' => 'col-md-6'
+    ]
+  ]);
 
-		<div class="pull-right btns-row">
-			<a href="/datasetFunder/admin" class="btn background-btn-o">Cancel</a>
-			<?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
-		</div>
+  $this->widget('application.components.controls.TextArea', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'grant_award',
+    'inputOptions' => [
+      'rows' => 4,
+      'cols' => 50
+    ],
+    'tooltip' => 'Type the Grant/Award ID provided by the submitter',
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ]
+  ]);
 
-		<?php $this->endWidget(); ?>
-	</div>
+  $this->widget('application.components.controls.TextArea', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'awardee',
+    'inputOptions' => [
+      'rows' => 4,
+      'cols' => 50
+    ],
+    'tooltip' => 'Insert the Principle Investigators name who was awarded the grant, use format Initials Surname e.g. CI Hunter',
+    'groupOptions' => [
+      'class' => 'col-md-6'
+    ]
+  ]);
 
+  $this->widget('application.components.controls.TextArea', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'comments',
+    'inputOptions' => [
+      'rows' => 4,
+      'cols' => 50
+    ],
+    'tooltip' => 'Use this field to include a program name if the award was part of a specific program, or other short details as required',
+    'groupOptions' => [
+      'class' => 'col-md-6'
+    ]
+  ]);
+  ?>
+
+  <div class="col-md-12">
+    <div class="pull-right btns-row">
+      <a href="/datasetFunder/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+      <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
+    </div>
+  </div>
+
+  <?php $this->endWidget(); ?>
 </div>
\ No newline at end of file
diff --git a/protected/views/datasetLog/_form.php b/protected/views/datasetLog/_form.php
index 059cbcf57b..f2ee208003 100644
--- a/protected/views/datasetLog/_form.php
+++ b/protected/views/datasetLog/_form.php
@@ -1,52 +1,60 @@
-<div class="section form row">
-
-	<div class="col-md-offset-3 col-md-6">
-		<?php $form = $this->beginWidget('CActiveForm', array(
-			'id' => 'dataset-log-form',
-			'enableAjaxValidation' => false,
-		)); ?>
-
-		<p class="note">Fields with <span class="required">*</span> are required.</p>
-
-		<?php if ($model->hasErrors()) : ?>
-			<div class="alert alert-danger">
-				<?php echo $form->errorSummary($model); ?>
-			</div>
-		<?php endif; ?>
-
-
-		<?php
-		$this->widget('application.components.controls.DropdownField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'dataset_id',
-			'listDataOptions' => [
-				'data' => Util::getDois(),
-				'valueField' => 'id',
-				'textField' => 'identifier',
-			],
-			'inputOptions' => [
-				'required' => true,
-			],
-		]);
-
-		$this->widget('application.components.controls.TextArea', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'message',
-			'inputOptions' => [
-				'rows' => 6,
-				'cols' => 50
-			],
-		]);
-		?>
-
-		<div class="pull-right btns-row">
-			<a href="/datasetLog/admin" class="btn background-btn-o">Cancel</a>
-			<?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
-		</div>
-
-		<?php $this->endWidget(); ?>
-	</div>
-
+<div class="section form">
+  <?php $form = $this->beginWidget('CActiveForm', array(
+    'id' => 'dataset-log-form',
+    'enableAjaxValidation' => false,
+    'htmlOptions' => [
+      'class' => 'row'
+    ]
+  )); ?>
+
+  <div class="col-md-12">
+    <p class="note">Fields with <span class="required">*</span> are required.</p>
+
+    <?php if ($model->hasErrors()): ?>
+      <div class="alert alert-danger">
+        <?php echo $form->errorSummary($model); ?>
+      </div>
+    <?php endif; ?>
+  </div>
+
+  <?php
+  $this->widget('application.components.controls.DropdownField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'dataset_id',
+    'listDataOptions' => [
+      'data' => Util::getDois(),
+      'valueField' => 'id',
+      'textField' => 'identifier',
+    ],
+    'inputOptions' => [
+      'required' => true,
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ],
+  ]);
+
+  $this->widget('application.components.controls.TextArea', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'message',
+    'inputOptions' => [
+      'rows' => 6,
+      'cols' => 50
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ],
+  ]);
+  ?>
+
+  <div class="col-md-12">
+    <div class="pull-right btns-row">
+      <a href="/datasetLog/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+      <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
+    </div>
+  </div>
+
+  <?php $this->endWidget(); ?>
 </div>
\ No newline at end of file
diff --git a/protected/views/funder/_form.php b/protected/views/funder/_form.php
index fbebba6446..55a62e61a7 100644
--- a/protected/views/funder/_form.php
+++ b/protected/views/funder/_form.php
@@ -1,47 +1,60 @@
-<div class="section form row">
-
-	<div class="col-md-offset-3 col-md-6">
-		<?php $form = $this->beginWidget('CActiveForm', array(
-			'id' => 'funder-form',
-			'enableAjaxValidation' => false,
-		)); ?>
-
-		<p class="note">Fields with <span class="required">*</span> are required.</p>
-
-		<?php if ($model->hasErrors()) : ?>
-			<div class="alert alert-danger">
-				<?php echo $form->errorSummary($model); ?>
-			</div>
-		<?php endif; ?>
-
-		<?php
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'uri',
-			'inputOptions' => [
-				'required' => true,
-			],
-		]);
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'primary_name_display',
-
-		]);
-		$this->widget('application.components.controls.TextField', [
-			'form' => $form,
-			'model' => $model,
-			'attributeName' => 'country',
-		]);
-		?>
-
-		<div class="pull-right btns-row">
-			<a href="/funder/admin" class="btn background-btn-o">Cancel</a>
-			<?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
-		</div>
-
-		<?php $this->endWidget(); ?>
-	</div>
-
+<div class="section form">
+  <?php $form = $this->beginWidget('CActiveForm', array(
+    'id' => 'funder-form',
+    'enableAjaxValidation' => false,
+    'htmlOptions' => [
+      'class' => 'row'
+    ]
+  )); ?>
+
+  <div class="col-md-12">
+    <p class="note">Fields with <span class="required">*</span> are required.</p>
+
+    <?php if ($model->hasErrors()): ?>
+      <div class="alert alert-danger">
+        <?php echo $form->errorSummary($model); ?>
+      </div>
+    <?php endif; ?>
+  </div>
+
+  <?php
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'uri',
+    'inputOptions' => [
+      'required' => true,
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-6'
+    ],
+  ]);
+
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'primary_name_display',
+    'groupOptions' => [
+      'class' => 'col-md-6'
+    ],
+  ]);
+
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'country',
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ],
+  ]);
+  ?>
+
+  <div class="col-md-12">
+    <div class="pull-right btns-row">
+      <a href="/funder/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+      <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
+    </div>
+  </div>
+
+  <?php $this->endWidget(); ?>
 </div>
\ No newline at end of file
diff --git a/protected/views/news/_form.php b/protected/views/news/_form.php
index 699bcb5989..45b9a566be 100644
--- a/protected/views/news/_form.php
+++ b/protected/views/news/_form.php
@@ -1,11 +1,13 @@
-<div class="section form row">
-
-    <div class="col-md-offset-3 col-md-6">
-        <?php $form = $this->beginWidget('CActiveForm', array(
-            'id' => 'news-form',
-            'enableAjaxValidation' => false,
-        )); ?>
+<div class="section form">
+    <?php $form = $this->beginWidget('CActiveForm', array(
+        'id' => 'news-form',
+        'enableAjaxValidation' => false,
+        'htmlOptions' => [
+            'class' => 'row'
+        ]
+    )); ?>
 
+    <div class="col-md-12">
         <p class="note">Fields with <span class="required">*</span> are required.</p>
 
         <?php if ($model->hasErrors()) : ?>
@@ -13,49 +15,66 @@
                 <?php echo $form->errorSummary($model); ?>
             </div>
         <?php endif; ?>
+    </div>
+
+    <?php
+    $this->widget('application.components.controls.TextField', [
+        'form' => $form,
+        'model' => $model,
+        'attributeName' => 'title',
+        'inputOptions' => [
+            'required' => true,
+            'maxlength' => 200
+        ],
+        'groupOptions' => [
+            'class' => 'col-md-12'
+        ],
+    ]);
+
+    $this->widget('application.components.controls.DateField', [
+        'form' => $form,
+        'model' => $model,
+        'attributeName' => 'start_date',
+        'inputOptions' => [
+            'required' => true,
+        ],
+        'groupOptions' => [
+            'class' => 'col-md-6'
+        ],
+    ]);
 
-        <?php
-        $this->widget('application.components.controls.TextField', [
-            'form' => $form,
-            'model' => $model,
-            'attributeName' => 'title',
-            'inputOptions' => [
-                'required' => true,
-                'maxlength' => 200
-            ],
-        ]);
-        $this->widget('application.components.controls.TextArea', [
-            'form' => $form,
-            'model' => $model,
-            'attributeName' => 'body',
-            'inputOptions' => [
-                'rows' => 6,
-                'cols' => 50
-            ],
-        ]);
-        $this->widget('application.components.controls.DateField', [
-            'form' => $form,
-            'model' => $model,
-            'attributeName' => 'start_date',
-            'inputOptions' => [
-                'required' => true,
-            ],
-        ]);
-        $this->widget('application.components.controls.DateField', [
-            'form' => $form,
-            'model' => $model,
-            'attributeName' => 'end_date',
-            'inputOptions' => [
-                'required' => true,
-            ],
-        ]);
-        ?>
+    $this->widget('application.components.controls.DateField', [
+        'form' => $form,
+        'model' => $model,
+        'attributeName' => 'end_date',
+        'inputOptions' => [
+            'required' => true,
+        ],
+        'groupOptions' => [
+            'class' => 'col-md-6'
+        ],
+    ]);
 
+    $this->widget('application.components.controls.TextArea', [
+        'form' => $form,
+        'model' => $model,
+        'attributeName' => 'body',
+        'inputOptions' => [
+            'rows' => 6,
+            'cols' => 50
+        ],
+        'groupOptions' => [
+            'class' => 'col-md-12'
+        ],
+    ]);
+    ?>
+
+    <div class="col-md-12">
         <div class="pull-right btns-row">
-            <a href="/news/admin" class="btn background-btn-o">Cancel</a>
-            <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
+            <a href="/news/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+            <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
         </div>
-
-        <?php $this->endWidget(); ?>
     </div>
+
+    <?php $this->endWidget(); ?>
 </div>
\ No newline at end of file
diff --git a/protected/views/report/index.php b/protected/views/report/index.php
index afc8614522..277a9394a4 100644
--- a/protected/views/report/index.php
+++ b/protected/views/report/index.php
@@ -1,46 +1,46 @@
 <div class="container">
-    <?php
-    $this->widget('TitleBreadcrumb', [
-        'pageTitle' => 'Report',
-        'breadcrumbItems' => [
-            ['label' => 'Admin', 'href' => '/site/admin'],
-            ['isActive' => true, 'label' => 'Report'],
-        ]
-    ]);
-    ?>
-
-    <div class="section form row">
-
-        <!-- NOTE leaving following code as comment as it seems related to missing scripts -->
-        <!-- <div class="chart" id="chart_div" style="width: 600px; height: 400px">
+  <?php
+  $this->widget('TitleBreadcrumb', [
+    'pageTitle' => 'Report',
+    'breadcrumbItems' => [
+      ['label' => 'Admin', 'href' => '/site/admin'],
+      ['isActive' => true, 'label' => 'Report'],
+    ]
+  ]);
+  ?>
+
+  <div class="section form">
+
+    <!-- NOTE leaving following code as comment as it seems related to missing scripts -->
+    <!-- <div class="chart" id="chart_div" style="width: 600px; height: 400px">
         </div>
         <div class="setting"></div> -->
 
-        <div class="col-md-offset-3 col-md-6">
-            <form class="form" method="POST">
-                <div class="form-group">
-                    <label class="control-label" for="Report_start_date">Start Date</label>
-                    <?= CHtml::dateField('Report[start_date]', isset($args['start_date']) ? $args['start_date'] : '', array('class' => 'form-control')) ?>
-                </div>
-                <div class="form-group">
-                    <label class="control-label" for="Report_end_date">End Date</label>
-                    <?= CHtml::dateField('Report[end_date]', isset($args['end_date']) ? $args['end_date'] : '', array('class' => 'form-control')) ?>
-                </div>
-                <div class="form-group">
-                    <label class="control-label" for="Report_ids">Display for DOI</label>
-                    <?php echo CHtml::dropDownList(
-                        'Report[ids][]',
-                        empty($selectDois) ? 'all' : $selectDois,
-                        $dois,
-                        array('class' => 'js-multi form-control', 'multiple' => 'multiple', 'data-placeholder' => Yii::t('app', 'Select DOIs'))
-                    ); ?>
-                </div>
-                <div class="pull-right">
-                    <input type="submit" class="btn background-btn" name="report" value="View" />
-                </div>
-            </form>
+    <form class="form row" method="POST">
+      <div class="form-group col-md-6">
+        <label class="control-label" for="Report_start_date">Start Date</label>
+        <?= CHtml::dateField('Report[start_date]', isset($args['start_date']) ? $args['start_date'] : '', array('class' => 'form-control')) ?>
+      </div>
+      <div class="form-group col-md-6">
+        <label class="control-label" for="Report_end_date">End Date</label>
+        <?= CHtml::dateField('Report[end_date]', isset($args['end_date']) ? $args['end_date'] : '', array('class' => 'form-control')) ?>
+      </div>
+      <div class="form-group col-md-12">
+        <label class="control-label" for="Report_ids">Display for DOI</label>
+        <?php echo CHtml::dropDownList(
+          'Report[ids][]',
+          empty($selectDois) ? 'all' : $selectDois,
+          $dois,
+          array('class' => 'js-multi form-control', 'multiple' => 'multiple', 'data-placeholder' => Yii::t('app', 'Select DOIs'))
+        ); ?>
+      </div>
+      <div class="col-md-12">
+        <div class="pull-right btns-row">
+          <input type="submit" class="btn background-btn btn-min-width" name="report" value="View" />
         </div>
-    </div>
+      </div>
+    </form>
+  </div>
 </div>
 
 <?php
@@ -71,92 +71,92 @@
 <!-- NOTE /js/jsapi.js not found -->
 <script type="text/javascript" src="/js/jsapi.js"></script>
 <script type="text/javascript">
-    // Load the Visualization API and the piechart package.
-    // NOTE Google is not defined
-    google.load('visualization', '1.0', {
-        'packages': ['corechart']
-    });
+  // Load the Visualization API and the piechart package.
+  // NOTE Google is not defined
+  google.load('visualization', '1.0', {
+    'packages': ['corechart']
+  });
+
+  // Set a callback to run when the Google Visualization API is loaded.
+  google.setOnLoadCallback(drawChart);
+
+  // Callback that creates and populates a data table,
+  // instantiates the pie chart, passes in the data and
+  // draws it.
+  function drawChart() {
+    // Create the data table.
+    var data = new google.visualization.DataTable();
+
+    data.addColumn('string', 'months');
+    data.addColumn('number', 'page views');
+    data.addColumn('number', 'total visits');
+    data.addColumn('number', 'number of unique visitors');
+
+    data.addRows(<?= $linedata ?>);
+
+    // Set chart options
+    var options = {
+      'title': 'Summary of DOIs',
+      'width': 600,
+      'height': 400,
+      'hAxis': {
+        'title': 'Date',
+        'logScale': true
+      },
+      'vAxis': {
+        'title': 'View',
+        'logScale': false
+      }
+    };
+
+    // Instantiate and draw our chart, passing in some options.
+    var chart = new google.visualization.LineChart(document.getElementById('chart_div'));
+    chart.draw(data, options);
+
+    // Add Listener to hide columns
+    var columns = [];
+    var series = {};
+
+    // save columns value
+    for (var i = 0; i < data.getNumberOfColumns(); i++) {
+      columns.push(i);
+      if (i > 0) {
+        series[i - 1] = {};
+      }
+    }
 
-    // Set a callback to run when the Google Visualization API is loaded.
-    google.setOnLoadCallback(drawChart);
-
-    // Callback that creates and populates a data table,
-    // instantiates the pie chart, passes in the data and
-    // draws it.
-    function drawChart() {
-        // Create the data table.
-        var data = new google.visualization.DataTable();
-
-        data.addColumn('string', 'months');
-        data.addColumn('number', 'page views');
-        data.addColumn('number', 'total visits');
-        data.addColumn('number', 'number of unique visitors');
-
-        data.addRows(<?= $linedata ?>);
-
-        // Set chart options
-        var options = {
-            'title': 'Summary of DOIs',
-            'width': 600,
-            'height': 400,
-            'hAxis': {
-                'title': 'Date',
-                'logScale': true
-            },
-            'vAxis': {
-                'title': 'View',
-                'logScale': false
-            }
-        };
-
-        // Instantiate and draw our chart, passing in some options.
-        var chart = new google.visualization.LineChart(document.getElementById('chart_div'));
-        chart.draw(data, options);
-
-        // Add Listener to hide columns
-        var columns = [];
-        var series = {};
-
-        // save columns value
-        for (var i = 0; i < data.getNumberOfColumns(); i++) {
-            columns.push(i);
-            if (i > 0) {
-                series[i - 1] = {};
-            }
+    options['series'] = series;
+
+    google.visualization.events.addListener(chart, 'select', function () {
+      var sel = chart.getSelection();
+      // if selection length is 0, we deselected an element
+      if (sel.length > 0) {
+        // if select row is not null, then we hide/show the data series
+        if (sel[0].row === null) {
+          var col = sel[0].column;
+          if (columns[col] == col) {
+            // hide the data series
+            columns[col] = {
+              label: data.getColumnLabel(col),
+              type: data.getColumnType(col),
+              calc: function () {
+                return null;
+              }
+            };
+            // grey out the legend entry
+            series[col - 1].color = '#CCCCCC';
+          } else {
+            // show the data series
+            columns[col] = col;
+            series[col - 1].color = null;
+          }
+          var view = new google.visualization.DataView(data);
+          // set the new columns
+          view.setColumns(columns);
+          // redraw the view
+          chart.draw(view, options);
         }
-
-        options['series'] = series;
-
-        google.visualization.events.addListener(chart, 'select', function() {
-            var sel = chart.getSelection();
-            // if selection length is 0, we deselected an element
-            if (sel.length > 0) {
-                // if select row is not null, then we hide/show the data series
-                if (sel[0].row === null) {
-                    var col = sel[0].column;
-                    if (columns[col] == col) {
-                        // hide the data series
-                        columns[col] = {
-                            label: data.getColumnLabel(col),
-                            type: data.getColumnType(col),
-                            calc: function() {
-                                return null;
-                            }
-                        };
-                        // grey out the legend entry
-                        series[col - 1].color = '#CCCCCC';
-                    } else {
-                        // show the data series
-                        columns[col] = col;
-                        series[col - 1].color = null;
-                    }
-                    var view = new google.visualization.DataView(data);
-                    // set the new columns
-                    view.setColumns(columns);
-                    // redraw the view
-                    chart.draw(view, options);
-                }
-            }
-        });
-    }
+      }
+    });
+  }
 </script>
\ No newline at end of file
diff --git a/protected/views/rssMessage/_form.php b/protected/views/rssMessage/_form.php
index 8424021534..e02e14249b 100644
--- a/protected/views/rssMessage/_form.php
+++ b/protected/views/rssMessage/_form.php
@@ -1,45 +1,55 @@
-<div class="section form row">
+<div class="section form">
+  <?php $form = $this->beginWidget('CActiveForm', array(
+    'id' => 'rss-message-form',
+    'enableAjaxValidation' => false,
+    'htmlOptions' => [
+      'class' => 'row'
+    ]
+  )); ?>
 
-    <div class="col-md-offset-3 col-md-6">
-        <?php $form = $this->beginWidget('CActiveForm', array(
-            'id' => 'rss-message-form',
-            'enableAjaxValidation' => false,
-        )); ?>
+  <div class="col-md-12">
+    <p class="note">Fields with <span class="required">*</span> are required.</p>
 
-        <p class="note">Fields with <span class="required">*</span> are required.</p>
+    <?php if ($model->hasErrors()): ?>
+      <div class="alert alert-danger">
+        <?php echo $form->errorSummary($model); ?>
+      </div>
+    <?php endif; ?>
+  </div>
 
-        <?php if ($model->hasErrors()) : ?>
-            <div class="alert alert-danger">
-                <?php echo $form->errorSummary($model); ?>
-            </div>
-        <?php endif; ?>
+  <?php
+  $this->widget('application.components.controls.TextField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'message',
+    'inputOptions' => [
+      'required' => true,
+      'maxlength' => 128
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ],
+  ]);
 
-        <?php
-        $this->widget('application.components.controls.TextField', [
-            'form' => $form,
-            'model' => $model,
-            'attributeName' => 'message',
-            'inputOptions' => [
-                'required' => true,
-                'maxlength' => 128
-            ],
-        ]);
-        $this->widget('application.components.controls.DateField', [
-            'form' => $form,
-            'model' => $model,
-            'attributeName' => 'publication_date',
-            'inputOptions' => [
-                'required' => true,
-            ],
-        ]);
-        ?>
+  $this->widget('application.components.controls.DateField', [
+    'form' => $form,
+    'model' => $model,
+    'attributeName' => 'publication_date',
+    'inputOptions' => [
+      'required' => true,
+    ],
+    'groupOptions' => [
+      'class' => 'col-md-12'
+    ],
+  ]);
+  ?>
 
-        <div class="pull-right btns-row">
-            <a href="/rssMessage/admin" class="btn background-btn-o">Cancel</a>
-            <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn')); ?>
-        </div>
-
-        <?php $this->endWidget(); ?>
+  <div class="col-md-12">
+    <div class="pull-right btns-row">
+      <a href="/rssMessage/admin" class="btn background-btn-o btn-min-width">Cancel</a>
+      <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'btn background-btn btn-min-width')); ?>
     </div>
+  </div>
 
+  <?php $this->endWidget(); ?>
 </div>
\ No newline at end of file

From e7ac64126ca5a07dd7bf5631efb96ad844f982bb Mon Sep 17 00:00:00 2001
From: luis-toptal <luis.martinez@toptal.com>
Date: Sat, 23 Nov 2024 15:05:05 +0700
Subject: [PATCH 09/11] feat: update user form

---
 protected/views/user/_form.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/protected/views/user/_form.php b/protected/views/user/_form.php
index 865e828895..8c817e9beb 100755
--- a/protected/views/user/_form.php
+++ b/protected/views/user/_form.php
@@ -1,6 +1,8 @@
- <div class="content col-md-offset-2 col-md-8">
+<div class="content">
+ 	<div class="row">
+    <div class="col-md-12">
 
- 	<?php
+  <?php
 		foreach (Yii::app()->user->getFlashes() as $key => $message) {
 			echo '<div class="flash-' . $key . '">' . $message . "</div>\n";
 		}
@@ -8,7 +10,6 @@
  	<?php
 		$user_command = UserCommand::model()->findByAttributes(array("requester_id" => $model->id, "status" => "pending"));
 		$linked_author = $model->id ? Author::findAttachedAuthorByUserId($model->id) : null;
-
 		?>
 
  	<?php
@@ -75,6 +76,9 @@
 			}
 		}
 		?>
+    </div>
+  </div>
+
 
  	<div>
  		<div class="subsection">
@@ -239,8 +243,8 @@
  					</div>
  				<? } ?>
  				<hr>
- 				<div class="pull-right">
- 					<?= CHtml::submitButton($model->isNewRecord ? Yii::t('app', 'Register') : 'Save', array('class' => 'btn background-btn submit-btn')) ?>
+ 				<div class="pull-right btns-row">
+ 					<?= CHtml::submitButton($model->isNewRecord ? Yii::t('app', 'Register') : 'Save', array('class' => 'btn background-btn submit-btn btn-min-width')) ?>
  				</div>
  				<div class="clearfix"></div>
  				<? $this->endWidget() ?>

From 41eef41591387d72fbd5ff4f713451cf6b4b7a47 Mon Sep 17 00:00:00 2001
From: luis-toptal <luis.martinez@toptal.com>
Date: Sat, 23 Nov 2024 15:07:00 +0700
Subject: [PATCH 10/11] chore: up log

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8802e816f..b2798ab5a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
 
+- Feat #2100: Admin forms layout fills screen width
 - Fix #2094: Make Semgrep-based SAST analyzer available in tagged release
 - Feat #701: Code refactoring to separate upload status transitions and notifications to prepare for upload status overhaul
 - Security #1867: Update the gitlab static application security testing (SAST) job using the Semgrep-based analyzer

From f068371b5d244a9af71e61a024fcb156c7d51dbf Mon Sep 17 00:00:00 2001
From: luis-toptal <luis.martinez@toptal.com>
Date: Sat, 23 Nov 2024 16:05:22 +0700
Subject: [PATCH 11/11] feat: admin dataset projects one col

---
 protected/views/adminDatasetProject/_form.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/protected/views/adminDatasetProject/_form.php b/protected/views/adminDatasetProject/_form.php
index e92640a908..2422c9e127 100644
--- a/protected/views/adminDatasetProject/_form.php
+++ b/protected/views/adminDatasetProject/_form.php
@@ -29,7 +29,7 @@
 			'required' => true,
 		],
 		'groupOptions' => [
-			'class' => 'col-md-6'
+			'class' => 'col-md-12'
 		],
 	]);
 	?>
@@ -48,7 +48,7 @@
 			'required' => true,
 		],
 		'groupOptions' => [
-			'class' => 'col-md-6'
+			'class' => 'col-md-12'
 		],
 	]);
 	?>