Moving examples, fixing dropdown

qcubed · Jul 6, 2017 · 9077301 · 9077301
1 parent 118f101
commit 9077301
Show file tree

Hide file tree

Showing 19 changed files with 28 additions and 26 deletions.
diff --git a/assets/php/examples/bootstrap_ex.php → examples/bootstrap_ex.php b/assets/php/examples/bootstrap_ex.php → examples/bootstrap_ex.php
diff --git a/assets/php/examples/bootstrap_ex.tpl.php → examples/bootstrap_ex.tpl.php b/assets/php/examples/bootstrap_ex.tpl.php → examples/bootstrap_ex.tpl.php
@@ -1,4 +1,4 @@
-<?php require(QCUBED_EXAMPLES_DIR . '/includes/header.inc.php'); ?>
+<?php     require(QCUBED_CONFIG_DIR . '/header.inc.php'); ?>
     <link href="<?= QCUBED_BOOTSTRAP_CSS ?>" rel="stylesheet">
 
 <?php $this->renderBegin(); ?>
@@ -44,4 +44,4 @@
 
 
 <?php $this->renderEnd(); ?>
-<?php require(QCUBED_EXAMPLES_DIR . '/includes/footer.inc.php'); ?>
+<?php     require(QCUBED_CONFIG_DIR . '/footer.inc.php'); ?>
diff --git a/assets/php/examples/cat.jpg → examples/cat.jpg b/assets/php/examples/cat.jpg → examples/cat.jpg
diff --git a/assets/php/examples/forms.php → examples/forms.php b/assets/php/examples/forms.php → examples/forms.php
diff --git a/assets/php/examples/forms1.tpl.php → examples/forms1.tpl.php b/assets/php/examples/forms1.tpl.php → examples/forms1.tpl.php
@@ -1,5 +1,5 @@
-<?php require(QCUBED_EXAMPLES_DIR . '/includes/header.inc.php'); ?>
-	<link href="<?= QCUBED_BOOTSTRAP_CSS ?>" rel="stylesheet">
+<?php     require(QCUBED_CONFIG_DIR . '/header.inc.php'); ?>
+    <link href="<?= QCUBED_BOOTSTRAP_CSS ?>" rel="stylesheet">
 
 <?php $this->renderBegin(); ?>
 
@@ -40,4 +40,4 @@
 	</div>
 
 <?php $this->renderEnd(); ?>
-<?php require(QCUBED_EXAMPLES_DIR . '/includes/footer.inc.php'); ?>
+<?php     require(QCUBED_CONFIG_DIR . '/footer.inc.php'); ?>
diff --git a/assets/php/examples/forms2.tpl.php → examples/forms2.tpl.php b/assets/php/examples/forms2.tpl.php → examples/forms2.tpl.php
@@ -1,4 +1,4 @@
-<?php require(QCUBED_EXAMPLES_DIR . '/includes/header.inc.php'); ?>
+<?php     require(QCUBED_CONFIG_DIR . '/header.inc.php'); ?>
     <link href="<?= QCUBED_BOOTSTRAP_CSS ?>" rel="stylesheet">
 
 <?php $this->renderBegin(); ?>
@@ -40,4 +40,4 @@
 	</div>
 
 <?php $this->renderEnd(); ?>
-<?php require(QCUBED_EXAMPLES_DIR . '/includes/footer.inc.php'); ?>
+<?php     require(QCUBED_CONFIG_DIR . '/footer.inc.php'); ?>
diff --git a/assets/php/examples/forms3.tpl.php → examples/forms3.tpl.php b/assets/php/examples/forms3.tpl.php → examples/forms3.tpl.php
@@ -1,4 +1,4 @@
-<?php require(QCUBED_EXAMPLES_DIR . '/includes/header.inc.php'); ?>
+<?php     require(QCUBED_CONFIG_DIR . '/header.inc.php'); ?>
     <link href="<?= QCUBED_BOOTSTRAP_CSS ?>" rel="stylesheet">
 
 <?php $this->renderBegin(); ?>
@@ -40,4 +40,4 @@
 	</div>
 
 <?php $this->renderEnd(); ?>
-<?php require(QCUBED_EXAMPLES_DIR . '/includes/footer.inc.php'); ?>
+<?php     require(QCUBED_CONFIG_DIR . '/footer.inc.php'); ?>
diff --git a/assets/php/examples/forms4.tpl.php → examples/forms4.tpl.php b/assets/php/examples/forms4.tpl.php → examples/forms4.tpl.php
@@ -1,4 +1,4 @@
-<?php require(QCUBED_EXAMPLES_DIR . '/includes/header.inc.php'); ?>
+<?php     require(QCUBED_CONFIG_DIR . '/header.inc.php'); ?>
     <link href="<?= QCUBED_BOOTSTRAP_CSS ?>" rel="stylesheet">
 	<link href="<?= QCUBED_BOOTSTRAP_ASSETS_URL ?>/css/qbootstrap.css" rel="stylesheet">
 
@@ -48,4 +48,4 @@
 	</div>
 
 <?php $this->renderEnd(); ?>
-<?php require(QCUBED_EXAMPLES_DIR . '/includes/footer.inc.php'); ?>
+<?php     require(QCUBED_CONFIG_DIR . '/footer.inc.php'); ?>
diff --git a/assets/php/examples/forms5.tpl.php → examples/forms5.tpl.php b/assets/php/examples/forms5.tpl.php → examples/forms5.tpl.php
@@ -1,4 +1,4 @@
-<?php require(QCUBED_EXAMPLES_DIR . '/includes/header.inc.php'); ?>
+<?php     require(QCUBED_CONFIG_DIR . '/header.inc.php'); ?>
     <link href="<?= QCUBED_BOOTSTRAP_CSS ?>" rel="stylesheet">
     <link href="<?= QCUBED_BOOTSTRAP_ASSETS_URL ?>/css/qbootstrap.css" rel="stylesheet">
 
@@ -56,4 +56,4 @@
 	</div>
 
 <?php $this->renderEnd(); ?>
-<?php require(QCUBED_EXAMPLES_DIR . '/includes/footer.inc.php'); ?>
+<?php     require(QCUBED_CONFIG_DIR . '/footer.inc.php'); ?>
diff --git a/assets/php/examples/list_group.php → examples/list_group.php b/assets/php/examples/list_group.php → examples/list_group.php
diff --git a/assets/php/examples/list_group.tpl.php → examples/list_group.tpl.php b/assets/php/examples/list_group.tpl.php → examples/list_group.tpl.php
@@ -1,4 +1,4 @@
-<?php require(QCUBED_EXAMPLES_DIR . '/includes/header.inc.php'); ?>
+<?php     require(QCUBED_CONFIG_DIR . '/header.inc.php'); ?>
     <link href="<?= QCUBED_BOOTSTRAP_CSS ?>" rel="stylesheet">
     <link href="<?= QCUBED_BOOTSTRAP_ASSETS_URL ?>/css/qbootstrap.css" rel="stylesheet">
 
@@ -41,4 +41,4 @@
 
 
 <?php $this->renderEnd(); ?>
-<?php require(QCUBED_EXAMPLES_DIR . '/includes/footer.inc.php'); ?>
+<?php     require(QCUBED_CONFIG_DIR . '/footer.inc.php'); ?>
diff --git a/assets/php/examples/modal.php → examples/modal.php b/assets/php/examples/modal.php → examples/modal.php
diff --git a/assets/php/examples/modal.tpl.php → examples/modal.tpl.php b/assets/php/examples/modal.tpl.php → examples/modal.tpl.php
@@ -1,4 +1,4 @@
-<?php require(QCUBED_EXAMPLES_DIR . '/includes/header.inc.php'); ?>
+<?php     require(QCUBED_CONFIG_DIR . '/header.inc.php'); ?>
     <link href="<?= QCUBED_BOOTSTRAP_CSS ?>" rel="stylesheet">
     <link href="<?= QCUBED_BOOTSTRAP_ASSETS_URL ?>/css/qbootstrap.css" rel="stylesheet">
 
@@ -30,4 +30,4 @@
 ?>
 
 <?php $this->renderEnd(); ?>
-<?php require(QCUBED_EXAMPLES_DIR . '/includes/footer.inc.php'); ?>
+<?php     require(QCUBED_CONFIG_DIR . '/footer.inc.php'); ?>
diff --git a/assets/php/examples/nav.php → examples/nav.php b/assets/php/examples/nav.php → examples/nav.php
diff --git a/assets/php/examples/nav.tpl.php → examples/nav.tpl.php b/assets/php/examples/nav.tpl.php → examples/nav.tpl.php
@@ -1,4 +1,4 @@
-<?php require(QCUBED_EXAMPLES_DIR . '/includes/header.inc.php'); ?>
+<?php     require(QCUBED_CONFIG_DIR . '/header.inc.php'); ?>
     <link href="<?= QCUBED_BOOTSTRAP_CSS ?>" rel="stylesheet">
     <link href="<?= QCUBED_BOOTSTRAP_ASSETS_URL ?>/css/qbootstrap.css" rel="stylesheet">
 
@@ -30,4 +30,4 @@
 
 
 <?php $this->renderEnd(); ?>
-<?php require(QCUBED_EXAMPLES_DIR . '/includes/footer.inc.php'); ?>
+<?php     require(QCUBED_CONFIG_DIR . '/footer.inc.php'); ?>
diff --git a/assets/php/examples/pig.jpg → examples/pig.jpg b/assets/php/examples/pig.jpg → examples/pig.jpg
diff --git a/assets/php/examples/qcubed.inc.php → examples/qcubed.inc.php b/assets/php/examples/qcubed.inc.php → examples/qcubed.inc.php
diff --git a/assets/php/examples/rhino.jpg → examples/rhino.jpg b/assets/php/examples/rhino.jpg → examples/rhino.jpg
diff --git a/src/Dropdown.php b/src/Dropdown.php
@@ -10,6 +10,7 @@
 namespace QCubed\Bootstrap;
 
 use QCubed\Action\ActionBase;
+use QCubed\Action\ActionParams;
 use QCubed\Control\ControlBase;
 use QCubed\Control\FormBase;
 use QCubed\Control\HList;
@@ -162,16 +163,17 @@ protected function makeJqWidget() {
 	/**
 	 * An override to make sure the public value gets decrypted before being sent to the action function.
 	 *
-	 * @param ActionBase $objAction
-	 * @param $mixParameter
-	 * @return mixed
+	 * @param ActionParams $params
+	 * @return void
 	 */
-	protected function processActionParameters(ActionBase $objAction, $mixParameter) {
-		$params = parent::processActionParameters($objAction, $mixParameter);
+	protected function processActionParameters(ActionParams $params) {
+		parent::processActionParameters($params);
 		if ($this->blnEncryptValues) {
-			$params['param']['value'] = $this->decryptValue($mixParameter['value']); // Decrypt the value if needed.
+		    $actionParam = $params->ActionParameter;
+
+            $actionParam['value'] = $this->decryptValue($actionParam['value']); // Decrypt the value if needed.
+            $params->ActionParameter = $actionParam;
 		}
-		return $params;
 	}
 
 	/**