From 308be6251e4cbd3c4fa877f246dbeb935acd941c Mon Sep 17 00:00:00 2001 From: "tristan.champomier" Date: Mon, 19 Apr 2021 12:13:18 +0200 Subject: [PATCH] Qware template enhancements --- data/template/qware/css/main.css | 39 ++++++++++++++++++- .../adminobject/actionadmin.mxt | 22 +++++++++-- .../adminobject/addobjectadmin.mxt | 2 +- lib/object_coordination/addcom/addcom.php | 2 +- .../adminnode/adminnode.php | 2 +- 5 files changed, 59 insertions(+), 8 deletions(-) diff --git a/data/template/qware/css/main.css b/data/template/qware/css/main.css index d5daac7..969c8ee 100644 --- a/data/template/qware/css/main.css +++ b/data/template/qware/css/main.css @@ -6,14 +6,49 @@ } #data div.tab-content.container-fluid form select{ - min-width: 190px; - max-width: 190px; + min-width: 180px; + max-width: 180px; +} + +#data div.tab-content.container-fluid form select.large{ + min-width: 200px; + max-width: 200px; +} + +#data div.tab-content.container-fluid form input{ + min-width: 180px; + max-width: 180px; +} + +#data div.tab-content.container-fluid form input.large{ + min-width: 200px; + max-width: 200px; +} + +#data div.tab-content.container-fluid form div.form-check{ +/* height: 38px; */ +/* margin-top: auto; */ +/* margin-bottom: auto; */ + border: 1px solid #dee2e6; + border-top-right-radius: .25rem; + border-bottom-right-radius: .25rem; +} + +#data div.tab-content.container-fluid form input.form-check-input{ + min-width: 50px; + max-width: 50px; + margin-top: auto; + margin-bottom: auto; } .input-group-text { min-width: 53px; } +.input-group-text.large { + min-width: 70px; +} + form#authSession.form div.input-group-prepend input.form{ box-sizing: border-box; border-radius: 0; diff --git a/data/template/qware/object_coordination/adminobject/actionadmin.mxt b/data/template/qware/object_coordination/adminobject/actionadmin.mxt index cc7e329..2c7e6cf 100755 --- a/data/template/qware/object_coordination/adminobject/actionadmin.mxt +++ b/data/template/qware/object_coordination/adminobject/actionadmin.mxt @@ -14,10 +14,25 @@
-
+
- - +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
@@ -27,6 +42,7 @@
+
diff --git a/data/template/qware/object_coordination/adminobject/addobjectadmin.mxt b/data/template/qware/object_coordination/adminobject/addobjectadmin.mxt index 8c69024..c920066 100755 --- a/data/template/qware/object_coordination/adminobject/addobjectadmin.mxt +++ b/data/template/qware/object_coordination/adminobject/addobjectadmin.mxt @@ -18,7 +18,7 @@
- diff --git a/lib/object_coordination/addcom/addcom.php b/lib/object_coordination/addcom/addcom.php index 5e6daed..52aa1de 100755 --- a/lib/object_coordination/addcom/addcom.php +++ b/lib/object_coordination/addcom/addcom.php @@ -195,7 +195,7 @@ var $tabForbidden=array("adminentrynode", "admingroup", "adminnode", "home", "ad $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("blocName", "loop"); } - $GLOBALS['SYSTEM_TEMPLATE']->MxSelect("icone", "iconeN", '', $tabIcone, 'Icône de la communauté', '', 'id="iconeN"', "class=\"form\" required=\"false\" title=\"".htmlspecialchars(getMessage("txtNodeIcon"), ENT_QUOTES)."\"", getMessage("txtNodeIcon")); + $GLOBALS['SYSTEM_TEMPLATE']->MxSelect("icone", "iconeN", '', $tabIcone, 'Icône de la communauté', '', 'id="iconeN"', "class=\"form large\" required=\"false\" title=\"".htmlspecialchars(getMessage("txtNodeIcon"), ENT_QUOTES)."\"", getMessage("txtNodeIcon")); $GLOBALS["SYSTEM_TEMPLATE"]->MxImage("pictoObject", $GLOBALS['CONF_DATA_PATH']."data/image/icons/node/defaultnode.png", getMessage("PreviewPicto")); $GLOBALS['SYSTEM_TEMPLATE']->MxText("txtNodeType", getMessage("txtNodeType")); diff --git a/lib/object_coordination/adminnode/adminnode.php b/lib/object_coordination/adminnode/adminnode.php index b048dd4..b3df242 100755 --- a/lib/object_coordination/adminnode/adminnode.php +++ b/lib/object_coordination/adminnode/adminnode.php @@ -438,7 +438,7 @@ Class AdminNode extends CoordinationObj systemRedirect(formatUrl($this->getId(), "AdminNode", "updateAdmin", "enableNode")); return "enableGroup"; } - printTabTreeNode($tabMove, $Node->getIdPere(), "ToHidde.NODE", "node_Id2"); + printTabTreeNode($tabMove, $Node->getIdPere(), "ToHidde.NODE", "node_Id2", false, "class=\"large\""); }else{ $GLOBALS['SYSTEM_TEMPLATE']->MxAttribut("urlAction", formatUrl($this->getId(), "AdminNode", "updateAdmin")); $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("ToHidde", "delete");