diff --git a/application/core/DB_Model.php b/application/core/DB_Model.php index 064cd1b9e..27a6224b9 100644 --- a/application/core/DB_Model.php +++ b/application/core/DB_Model.php @@ -27,10 +27,10 @@ class DB_Model extends FHC_Model // UDF validation attributes const UDF_REGEX = 'regex'; - const UDF_REGEX_LANG = 'php'; const UDF_REQUIRED = 'required'; const UDF_MAX_VALUE = 'max-value'; const UDF_MIN_VALUE = 'min-value'; + const UDF_REGEX_LANG = 'php'; const UDF_MAX_LENGTH = 'max-length'; const UDF_MIN_LENGTH = 'min-length'; @@ -991,8 +991,8 @@ class DB_Model extends FHC_Model // If validation rules are present for this UDF description and the required attribute is === true // then add this UDF into $requiredUDFsArray if(isset($decodedUDFDefinition->validation) - && isset($decodedUDFDefinition->validation->required) - && $decodedUDFDefinition->validation->required === true) + && isset($decodedUDFDefinition->validation->{DB_Model::UDF_REQUIRED}) + && $decodedUDFDefinition->validation->{DB_Model::UDF_REQUIRED} === true) { $requiredUDFsArray[$decodedUDFDefinition->{DB_Model::UDF_ATTRIBUTE_NAME}] = error( $decodedUDFDefinition->{DB_Model::UDF_ATTRIBUTE_NAME}, @@ -1021,8 +1021,8 @@ class DB_Model extends FHC_Model // then removes this UDF from the array $requiredUDFsArray // because this UDF is present in the property UDFs (the list of UDFs that should be stored) // therefore it was supplied - if (isset($decodedUDFDefinition->validation->required) - && $decodedUDFDefinition->validation->required === true + if (isset($decodedUDFDefinition->validation->{DB_Model::UDF_REQUIRED}) + && $decodedUDFDefinition->validation->{DB_Model::UDF_REQUIRED} === true && isset($requiredUDFsArray[$decodedUDFDefinition->{DB_Model::UDF_ATTRIBUTE_NAME}])) { unset($requiredUDFsArray[$decodedUDFDefinition->{DB_Model::UDF_ATTRIBUTE_NAME}]); diff --git a/application/views/system/udf.php b/application/views/system/udf.php index 12405b558..ad8f2af1e 100644 --- a/application/views/system/udf.php +++ b/application/views/system/udf.php @@ -1,7 +1,7 @@ -load->view("templates/header", array("title" => "UDF")); ?> +load->view("templates/header", array("title" => "UDF", "widgetsCSS" => true)); ?> - + - + Person   - + Prestudent @@ -63,7 +63,7 @@ - + widgetlib->UDFWidget( array( @@ -77,7 +77,7 @@   - + widgetlib->UDFWidget( array( diff --git a/application/views/templates/header.php b/application/views/templates/header.php index 97d280585..a32817227 100644 --- a/application/views/templates/header.php +++ b/application/views/templates/header.php @@ -13,6 +13,7 @@ isset($title) ? $title = 'VileSci - '.$title : $title = 'VileSci'; !isset($jsoneditor) ? $jsoneditor = false : $jsoneditor = $jsoneditor; !isset($jsonforms) ? $jsonforms = false : $jsonforms = $jsonforms; !isset($textile) ? $textile = false : $textile = $textile; +!isset($widgetsCSS) ? $widgetsCSS = false : $widgetsCSS = $widgetsCSS; if ($tablesort || $jquery_checkboxes || $jquery_custom) $jquery = true; @@ -67,4 +68,7 @@ if ($tablesort || $jquery_checkboxes || $jquery_custom) + + + \ No newline at end of file diff --git a/application/views/widgets/checkbox.php b/application/views/widgets/checkbox.php index d6a233115..3e3ec6ed8 100644 --- a/application/views/widgets/checkbox.php +++ b/application/views/widgets/checkbox.php @@ -1,30 +1,42 @@ - - - - - - - - - - - value="" -> - + +
+
+ +
+ +
+ +
+ + + + + + + + value="" + > +
+
+ +
+
+
+ \ No newline at end of file diff --git a/application/views/widgets/dropdown.php b/application/views/widgets/dropdown.php index 3cbdbff23..6873cdd26 100644 --- a/application/views/widgets/dropdown.php +++ b/application/views/widgets/dropdown.php @@ -1,56 +1,71 @@ - - - - + ?> +
+ +
+ + + \ No newline at end of file diff --git a/application/views/widgets/textarea.php b/application/views/widgets/textarea.php index 920211b69..630cf6b48 100644 --- a/application/views/widgets/textarea.php +++ b/application/views/widgets/textarea.php @@ -1,24 +1,32 @@ - - - - + +
+
+ +
+ +
+ +
+ +
+
+
+ \ No newline at end of file diff --git a/application/views/widgets/textfield.php b/application/views/widgets/textfield.php index ce01bd463..2f9d44a3e 100644 --- a/application/views/widgets/textfield.php +++ b/application/views/widgets/textfield.php @@ -1,23 +1,33 @@ - - - - - - - - - - - value="" -> + +
+
+ +
+ +
+ +
+ + + + + + + + value="" + > +
+
+
+ \ No newline at end of file diff --git a/application/widgets/UDFWidget.php b/application/widgets/UDFWidget.php index 5bc51d911..7231cc675 100644 --- a/application/widgets/UDFWidget.php +++ b/application/widgets/UDFWidget.php @@ -7,6 +7,8 @@ class UDFWidget extends UDFWidgetTpl { const NAME = 'name'; const TYPE = 'type'; + const REQUIRED = 'udf-required'; + const VALIDATION = 'validation'; const LIST_VALUES = 'listValues'; const REGEX_LANGUAGE = 'js'; @@ -369,16 +371,16 @@ class UDFWidget extends UDFWidgetTpl private function _setValidationAttributes($jsonSchema) { // Validation + $this->_args[Widget::HTML_ARG_NAME][UDFWidget::REQUIRED] = null; $this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::REGEX] = null; - $this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::REQUIRED] = null; $this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::MAX_VALUE] = null; $this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::MIN_VALUE] = null; if (isset($jsonSchema->validation)) { - if (isset($jsonSchema->validation->regex) && is_array($jsonSchema->validation->regex)) + if (isset($jsonSchema->{UDFWidget::VALIDATION}->{UDFWidgetTpl::REGEX}) && is_array($jsonSchema->{UDFWidget::VALIDATION}->{UDFWidgetTpl::REGEX})) { - foreach($jsonSchema->validation->regex as $regex) + foreach($jsonSchema->{UDFWidget::VALIDATION}->{UDFWidgetTpl::REGEX} as $regex) { if ($regex->language === UDFWidget::REGEX_LANGUAGE) { @@ -387,20 +389,20 @@ class UDFWidget extends UDFWidgetTpl } } - if (isset($jsonSchema->validation->required)) + if (isset($jsonSchema->{UDFWidget::VALIDATION}->{UDFWidgetTpl::REQUIRED})) { - $this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::REQUIRED] = $jsonSchema->validation->required; + $this->_args[Widget::HTML_ARG_NAME][UDFWidget::REQUIRED] = $jsonSchema->{UDFWidget::VALIDATION}->{UDFWidgetTpl::REQUIRED}; } - if (isset($jsonSchema->validation->{UDFWidgetTpl::MAX_VALUE})) + if (isset($jsonSchema->{UDFWidget::VALIDATION}->{UDFWidgetTpl::MAX_VALUE})) { - $this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::MAX_VALUE] = $jsonSchema->validation->{UDFWidgetTpl::MAX_VALUE}; + $this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::MAX_VALUE] = $jsonSchema->{UDFWidget::VALIDATION}->{UDFWidgetTpl::MAX_VALUE}; } - if (isset($jsonSchema->validation->{UDFWidgetTpl::MIN_VALUE})) + if (isset($jsonSchema->{UDFWidget::VALIDATION}->{UDFWidgetTpl::MIN_VALUE})) { - $this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::MIN_VALUE] = $jsonSchema->validation->{UDFWidgetTpl::MIN_VALUE}; + $this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::MIN_VALUE] = $jsonSchema->{UDFWidget::VALIDATION}->{UDFWidgetTpl::MIN_VALUE}; } } - } + } } \ No newline at end of file diff --git a/skin/widgets.css b/skin/widgets.css new file mode 100644 index 000000000..bf8a32f64 --- /dev/null +++ b/skin/widgets.css @@ -0,0 +1,20 @@ +.div-table { + display: table; +} + +.div-row { + display: table-row; +} + +.div-cell { + display: table-cell; +} + +.align-middle { + vertical-align: middle; +} + +.align-top { + vertical-align: top; + padding-top: 1px; +} \ No newline at end of file