From 03f4f0fb21745676183d40477b1b250c42fe1ff4 Mon Sep 17 00:00:00 2001 From: Olle Haerstedt Date: Mon, 21 Dec 2015 12:09:56 +0100 Subject: [PATCH] Dev: Adapt attribute settings to Bootstrap --- .../controllers/admin/participantsaction.php | 6 +- .../admin/participants/viewAttribute_view.php | 131 ++++++++---------- scripts/admin/viewAttribute.js | 2 +- 3 files changed, 66 insertions(+), 73 deletions(-) diff --git a/application/controllers/admin/participantsaction.php b/application/controllers/admin/participantsaction.php index 2029c7d810b..25ffa339385 100644 --- a/application/controllers/admin/participantsaction.php +++ b/application/controllers/admin/participantsaction.php @@ -946,8 +946,8 @@ function viewAttribute() 'attributevalues' => ParticipantAttributeName::model()->getAttributesValues($iAttributeId), 'aAttributes' => ParticipantAttributeName::model()->getAllAttributes() ); - App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl').'participants.css'); - App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl').'viewAttribute.css'); + //App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl').'participants.css'); + //App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl').'viewAttribute.css'); App()->getClientScript()->registerScriptFile( App()->getAssetManager()->publish( ADMIN_SCRIPT_PATH . "viewAttribute.js")); $this->_renderWrappedTemplate('participants', array('participantsPanel', 'viewAttribute'), $aData); } @@ -967,6 +967,8 @@ function saveAttribute() ); ParticipantAttributeName::model()->saveAttribute($aData); + //echo "
"; var_dump($_POST); echo "
"; die; + // Save translations if (isset($_POST['lang'])) { diff --git a/application/views/admin/participants/viewAttribute_view.php b/application/views/admin/participants/viewAttribute_view.php index 6a633625616..a0250262cb4 100644 --- a/application/views/admin/participants/viewAttribute_view.php +++ b/application/views/admin/participants/viewAttribute_view.php @@ -19,29 +19,38 @@
- getController()->createUrl('admin/participants/sa/saveAttribute/aid/' . Yii::app()->request->getQuery('aid')) . '/', "post",array('class'=>'form-inline col-md-6 col-md-offset-3')); ?> + getController()->createUrl('admin/participants/sa/saveAttribute/aid/' . Yii::app()->request->getQuery('aid')) . '/', "post",array('class'=>'form-horizontal col-md-6 col-md-offset-3', 'role' => 'form')); ?> -
- 'required')); ?> -
-
- 'Text box', - 'DD' => 'Drop-down list', - 'DP' => 'Date'), - array('class'=>'form-control') +
+ +
+ 'required', 'class' => 'form-control')); ?> +
+
- ); - ?> -
-
- 'TRUE','uncheckValue'=>'FALSE')); ?> -
+
+ +
+ 'Text box', + 'DD' => 'Drop-down list', + 'DP' => 'Date'), + array('class'=>'form-control') + ); + ?> +
+
+ +
+ +
+ 'TRUE','uncheckValue'=>'FALSE')); ?> +
+
-
- - - - - - - - -
- -
- 'form-control')); - ?> - - -
+
+ +
+ 'form-control')); ?> +
+
+
- +
    - $value): ?> -
  • > - '> - - - -
    • - + $value): ?> +
  • > + '> + + + +
    • +
+ $value) { ?>
-
- - - - - - - -
- -
- 'languagesetting', 'style'=>'border: 1px solid #ccc')); ?> -
+
+ +
+ 'languagesetting form-control')); ?> +
- - -

- gT('Save'))); - echo CHtml::endForm(); - ?> -

+
+
+ gT('Save'), 'class' => 'btn btn-default')); + ?> +
+
+ diff --git a/scripts/admin/viewAttribute.js b/scripts/admin/viewAttribute.js index 79145cebcee..fdec6a1a43a 100644 --- a/scripts/admin/viewAttribute.js +++ b/scripts/admin/viewAttribute.js @@ -31,7 +31,7 @@ $(document).ready(function() { // Add li anchor and content $('#tabs ul').append( - '' + '' ); $('#tabs').append('
');