Fixed issue: Page Header and TopBar: Settings - Homepage Settings - C…

…reate Box - Added Green Bar - Added Shadow under Top Bar - Adjusted content - Moved Required Message to the bottom of the page - Updated old URL createbox
LimeSurvey · Jun 10, 2021 · 5f2eedd · 5f2eedd
1 parent b62a9d0
commit 5f2eedd
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 22 deletions.
diff --git a/application/controllers/HomepageSettingsController.php b/application/controllers/HomepageSettingsController.php
@@ -107,11 +107,25 @@ public function actionCreateBox()
             }
         }
 
+        $this->aData = [
+            'pageTitle' => 'New box',
+            'fullpagebar' => [
+                'savebutton' => [
+                    'form' => 'boxes-form',
+                ],
+                'saveandclosebutton' => [
+                    'form' => 'boxes-form'
+                ],
+                'closebutton' => [
+                    'url' => Yii::app()->createUrl('homepageSettings/index')
+                ]
+            ],
+            'model' => $model,
+        ];
+
         $this->render(
             'create',
-            [
-                'model' => $model
-            ]
+            $this->aData
         );
     }
 

diff --git a/application/views/admin/super/fullpagebar_view.php b/application/views/admin/super/fullpagebar_view.php
@@ -23,27 +23,27 @@
 
             <!-- Save and Close -->
             <?php if(isset($fullpagebar['saveandclosebutton']['form'])):?>
-                <a class="btn btn-default" href="#" role="button" id="save-and-close-form-button" onclick="$(this).addClass('disabled').attr('onclick', 'return false;');" data-form-id="<?php echo $fullpagebar['saveandclosebutton']['form']; ?>">
+                <a class="btn btn-default" href="#" role="button" id="save-and-close-form-button" onclick="$(this).addClass('disabled').attr('onclick', 'return false;');" data-form-id="<?php echo $fullpagebar['saveandclosebutton']['form']; ?>" style="margin-top: 10px;">
                     <span class="fa fa-saved"></span>
                     <?php eT("Save and close");?>
                 </a>
             <?php endif; ?>
 
             <!-- Close -->
             <?php if(isset($fullpagebar['closebutton']['url'])):?>
-                <a class="btn btn-danger" href="<?php echo $fullpagebar['closebutton']['url']; ?>" role="button">
+                <a class="btn btn-danger" href="<?php echo $fullpagebar['closebutton']['url']; ?>" role="button" style="margin-top: 10px;">
                     <span class="fa fa-close"></span>
                     <?php eT("Close");?>
                 </a>
             <?php endif;?>
 
             <!-- Box Buttons -->
             <?php if(isset($fullpagebar['boxbuttons'])):?>
-                <a href="<?php echo $this->createUrl('homepageSettings/createBox/');?>" class="btn btn-default">
+                <a href="<?php echo $this->createUrl('homepageSettings/createBox/');?>" class="btn btn-default" style="margin-top: 10px;">
                     <span class="icon-add  text-success"></span>
                     <?php eT("Create a new box");?>
                 </a>
-                <a href="<?php echo $this->createUrl('homepageSettings/resetAllBoxes/');?>" class="btn btn-danger" data-confirm="<?php eT('This will delete all current boxes to restore the default ones. Are you sure you want to continue?'); ?>">
+                <a href="<?php echo $this->createUrl('homepageSettings/resetAllBoxes/');?>" class="btn btn-danger" data-confirm="<?php eT('This will delete all current boxes to restore the default ones. Are you sure you want to continue?'); ?>" style="margin-top: 10px;">
                     <span class="fa fa-refresh"></span>
                     <?php eT("Reset to default boxes");?>
                 </a>

diff --git a/application/views/homepageSettings/_form.php b/application/views/homepageSettings/_form.php
@@ -14,7 +14,6 @@
                 // See class documentation of CActiveForm for details on this.
                 'enableAjaxValidation'=>false
             )); ?>
-                <p class="note"><?php printf(gT('Fields with %s*%s are required.'),'<span class="required">','</span>'); ?></p>
 
                 <?php if($form->errorSummary($model)):?>
                     <div class="alert alert-danger" role="alert">
@@ -156,6 +155,7 @@
                     <?php endif;?>
                 </div>
 
+    <p class="note"><?php printf(gT('Fields with %s*%s are required.'),'<span class="required">','</span>'); ?></p>
                 <div class="form-group buttons">
                     <?php echo CHtml::submitButton($model->isNewRecord ? 'Create' : 'Save', array('class' => 'form-control hidden')); ?>
                 </div>

diff --git a/application/views/homepageSettings/create.php b/application/views/homepageSettings/create.php
@@ -7,16 +7,6 @@
 ?>
 <div class="col-lg-12 list-surveys">
 
-    <?php $this->renderPartial('//admin/super/fullpagebar_view', array(
-        'fullpagebar' => array(
-            'savebutton' => array('form' => 'boxes-form'),
-            'saveandclosebutton' => array('form' => 'boxes-form'),
-            'closebutton' => array('url' => Yii::app()->createUrl('homepageSettings/index'))
-        )
-    )); ?>
-
-    <h3><?php eT('New box');?></h3>
-
     <div class="row">
         <div class="col-lg-12 content-right">
 

diff --git a/application/views/layouts/fullpagebar_view.php b/application/views/layouts/fullpagebar_view.php
@@ -18,31 +18,31 @@
 
             <!-- Save -->
             <?php if (isset($fullpagebar['savebutton']['form'])) :?>
-                <a class="btn btn-success" href="#" role="button" id="save-form-button" onclick="$(this).addClass('disabled').attr('onclick', 'return false;');" data-form-id="<?php echo $fullpagebar['savebutton']['form']; ?>">
+                <a class="btn btn-success" href="#" role="button" id="save-form-button" onclick="$(this).addClass('disabled').attr('onclick', 'return false;');" data-form-id="<?php echo $fullpagebar['savebutton']['form']; ?>" style="margin-top: 10px;">
                     <span class="fa fa-floppy-o"></span>
                     <?php eT("Save");?>
                 </a>
             <?php endif;?>
 
             <!-- Save and Close -->
             <?php if (isset($fullpagebar['saveandclosebutton']['form'])) :?>
-                <a class="btn btn-default" href="#" role="button" id="save-and-close-form-button" onclick="$(this).addClass('disabled').attr('onclick', 'return false;');" data-form-id="<?php echo $fullpagebar['saveandclosebutton']['form']; ?>">
+                <a class="btn btn-default" href="#" role="button" id="save-and-close-form-button" onclick="$(this).addClass('disabled').attr('onclick', 'return false;');" data-form-id="<?php echo $fullpagebar['saveandclosebutton']['form']; ?>" style="margin-top: 10px;">
                     <span class="fa fa-saved"></span>
                     <?php eT("Save and close");?>
                 </a>
             <?php endif; ?>
 
             <!-- Close -->
             <?php if (isset($fullpagebar['closebutton']['url'])) :?>
-                <a class="btn btn-danger" href="<?php echo $fullpagebar['closebutton']['url']; ?>" role="button">
+                <a class="btn btn-danger" href="<?php echo $fullpagebar['closebutton']['url']; ?>" role="button" style="margin-top: 10px;">
                     <span class="fa fa-close"></span>
                     <?php eT("Close");?>
                 </a>
             <?php endif;?>
 
             <!-- Box Buttons -->
             <?php if (isset($fullpagebar['boxbuttons'])) :?>
-                <a href="<?php echo $this->createUrl('admin/homepagesettings/sa/create/');?>" class="btn btn-default" style="margin-top: 10px;">
+                <a href="<?php echo $this->createUrl('homepageSettings/createBox/');?>" class="btn btn-default" style="margin-top: 10px;">
                     <span class="icon-add  text-success"></span>
                     <?php eT("Create a new box");?>
                 </a>