From d87981a204f617117ec1330b6cbb199e1b72df56 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 26 Apr 2018 08:50:44 +0200 Subject: [PATCH] more preparations for update to bootstrap 4 use functions instead of plain html in views --- views/bootstrap/class.AttributeMgr.php | 4 +- views/bootstrap/class.Categories.php | 9 +- views/bootstrap/class.Charts.php | 12 +-- views/bootstrap/class.DashBoard.php | 32 +++---- views/bootstrap/class.DefaultKeywords.php | 8 +- views/bootstrap/class.GroupMgr.php | 4 +- views/bootstrap/class.Statistic.php | 8 +- views/bootstrap/class.Timeline.php | 57 ++++++------- views/bootstrap/class.UserDefaultKeywords.php | 44 +++++----- views/bootstrap/class.UsrMgr.php | 4 +- views/bootstrap/class.WorkflowActionsMgr.php | 58 ++++++------- views/bootstrap/class.WorkflowMgr.php | 83 +++++++++---------- views/bootstrap/class.WorkflowStatesMgr.php | 80 ++++++++---------- 13 files changed, 183 insertions(+), 220 deletions(-) diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php index d0f0a5dfd..59cadfd00 100644 --- a/views/bootstrap/class.AttributeMgr.php +++ b/views/bootstrap/class.AttributeMgr.php @@ -310,9 +310,9 @@ $(document).ready( function() {
-
+ contentContainerStart(); ?>
getID()."\"" : "") ?>>
-
+ contentContainerEnd(); ?>
diff --git a/views/bootstrap/class.Categories.php b/views/bootstrap/class.Categories.php index 7f882d640..60b907594 100644 --- a/views/bootstrap/class.Categories.php +++ b/views/bootstrap/class.Categories.php @@ -144,7 +144,7 @@ $(document).ready( function() { $this->contentHeading(getMLText("global_document_categories")); ?>
-
+
+params['session']->getLanguage()).'"> + - - - + + - -
-
-
- -
- >
- >
- >
- >
- >
- >
- >
-
-
-
- -
- -
-
+ '; + $this->formField( + getMLText("date"), + $html + ); + $html = ' + '.getMLText('timeline_skip_add_file').'
+ '.getMLText('timeline_skip_status_change_0').'
+ '.getMLText('timeline_skip_status_change_1').'
+ '.getMLText('timeline_skip_status_change_2').'
+ '.getMLText('timeline_skip_status_change_3').'
+ '.getMLText('timeline_skip_status_change_-1').'
+ '.getMLText('timeline_skip_status_change_-3').'
'; + $this->formField( + getMLText("exclude_items"), + $html + ); + $this->formSubmit(' '.getMLText('update'), 'update'); +?> \n"; + $this->contentContainerEnd(); echo "
"; echo "
\n"; diff --git a/views/bootstrap/class.UserDefaultKeywords.php b/views/bootstrap/class.UserDefaultKeywords.php index 9c3083aab..40d11e527 100644 --- a/views/bootstrap/class.UserDefaultKeywords.php +++ b/views/bootstrap/class.UserDefaultKeywords.php @@ -77,15 +77,12 @@ $(document).ready(function() { ?>
-
+ contentContainerStart(); ?>
-
- -
- '; + $this->formField( + getMLText("selection"), + $html + ); ?> - -
-
-
+ contentContainerEnd(); ?>
-
+ contentContainerStart(); ?> -
+ contentContainerEnd(); ?>
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php index 328d6d1dc..f2743d2ea 100644 --- a/views/bootstrap/class.UsrMgr.php +++ b/views/bootstrap/class.UsrMgr.php @@ -528,10 +528,10 @@ $(document).ready( function() {
-
+ contentContainerStart(); ?>
getID()."\"" : "") ?>>
-
+ contentContainerEnd(); ?> isUsed()) { -?> -

-infoMsg(getMLText('workflow_action_in_use')); } else { ?>
@@ -117,6 +115,7 @@ $(document).ready( function() { } } ?> + contentContainerStart(); ?> formField( + getMLText("workflow_action_name"), + '' + ); + $this->formSubmit(' '.getMLText("save")); ?> -
- -
- -
-
-
- -
- -
-
+ contentContainerEnd(); ?>
-
-
-
-
- -
-'; + $this->formField( + getMLText("selection"), + $html + ); ?> - -
+ + contentContainerEnd(); ?> +
getID()."\"" : "") ?>>
- -
-
getID()."\"" : "") ?>>
-
-
-
+
getID()."\"" : "") ?>>
-
contentEnd(); $this->htmlEndPage(); diff --git a/views/bootstrap/class.WorkflowMgr.php b/views/bootstrap/class.WorkflowMgr.php index 6844cd1ce..f98bd8a16 100644 --- a/views/bootstrap/class.WorkflowMgr.php +++ b/views/bootstrap/class.WorkflowMgr.php @@ -134,7 +134,7 @@ $(document).ready(function() { } } ?> -
+ contentContainerStart(); ?>
formField( + getMLText("workflow_name"), + '' + ); + $html = ' + '; + $this->formField( + getMLText("workflow_initstate"), + $html + ); + $this->formSubmit(' '.getMLText("save")); ?> -
- -
- "> -
-
-
- -
- -
-
- -
- -
-
-
+ contentContainerEnd(); ?> getAllWorkflowActions(); @@ -320,31 +312,30 @@ $(document).ready(function() { ?>
-
-
-
-
- -
-'; + $this->formField( + getMLText("selection"), + $html + ); ?> - -
+ + contentContainerEnd(); ?> +
getID()."\"" : "") ?>>
- -
-
getID()."\"" : "") ?>>
-
-
+
getID()."\"" : "") ?>>
-
+
isUsed()) { -?> -

-infoMsg(getMLText('workflow_state_in_use')); } else { ?>
@@ -118,6 +116,7 @@ $(document).ready(function() { } } ?> + contentContainerStart(); ?> -
- -
- -
-
-
- -
+ $this->formField( + getMLText("workflow_state_name"), + '' + ); + $html = ' -
-
-
- -
- -
-
+ + + '; + $html .= ''; + $this->formField( + getMLText("workflow_state_docstatus"), + $html + ); + $this->formSubmit(' '.getMLText("save")); +?>
+ contentContainerEnd(); ?>
-
-
-
-
- -
-'; + $this->formField( + getMLText("selection"), + $html + ); ?> - -
+ + contentContainerEnd(); ?> +
getID()."\"" : "") ?>>
- -
-
getID()."\"" : "") ?>>
-
-
-
-
getID()."\"" : "") ?>>
+
+
getID()."\"" : "") ?>>
-
contentEnd();