From 79aa14c04217f978fe7bbe88920cde62cb1f994a Mon Sep 17 00:00:00 2001 From: Felipe Figueroa Date: Wed, 6 Jan 2021 16:40:13 -0300 Subject: replaced most usages of stc/views --- assets/js/ac_insert_row.js | 2 +- assets/js/jstree_events.js | 19 +++- assets/templates/browser.twig | 33 +++--- assets/templates/components/browser_body.twig | 24 ++--- assets/templates/components/common_body.twig | 35 +++---- assets/templates/components/common_head.twig | 93 +++++++---------- assets/templates/components/tabs.twig | 30 +++--- assets/templates/components/trail.twig | 81 ++++++++------- assets/templates/deprecated.iframe_view.twig | 18 ---- assets/templates/footer.twig | 44 ++++---- assets/templates/footer_iframe.twig | 26 ----- assets/templates/header.twig | 32 +++++- assets/templates/header_sqledit.twig | 19 ++-- assets/templates/intro_view.twig | 30 +++--- assets/themes/global.less | 143 +++++++++++++------------- src/classes/ContainerUtils.php | 20 ++-- src/controllers/TreeController.php | 12 +-- src/decorators/ActionUrlDecorator.php | 2 +- src/decorators/BranchUrlDecorator.php | 13 ++- src/decorators/Decorator.php | 24 ++--- src/decorators/FieldDecorator.php | 12 +-- src/decorators/RedirectUrlDecorator.php | 6 +- src/decorators/UrlDecorator.php | 4 +- src/router.php | 32 ++---- src/xhtml/HTMLTableController.php | 2 +- 25 files changed, 343 insertions(+), 413 deletions(-) delete mode 100644 assets/templates/deprecated.iframe_view.twig delete mode 100644 assets/templates/footer_iframe.twig diff --git a/assets/js/ac_insert_row.js b/assets/js/ac_insert_row.js index c90d192e..3a9a3c3e 100644 --- a/assets/js/ac_insert_row.js +++ b/assets/js/ac_insert_row.js @@ -113,7 +113,7 @@ function openlist(e) { }; jQuery.ajax({ - url: subfolder + '/src/views/acinsert.php?server=' + server, + url: subfolder + '/acinsert?server=' + server, type: 'post', data: datas, dataType: 'html', diff --git a/assets/js/jstree_events.js b/assets/js/jstree_events.js index dfb3e3ef..651dc62d 100644 --- a/assets/js/jstree_events.js +++ b/assets/js/jstree_events.js @@ -6,17 +6,24 @@ window.jsTree = $('#lazy').jstree({ core: { data: { url: function (node) { + let leafs_url; if (node.id === '#') { - return stateObj.subfolder + '/src/views/browser?action=tree'; + leafs_url = stateObj.subfolder + '/browser?action=tree'; } else { - return node.original.url; + leafs_url = node.original.url; } + console.log({ leafs_url }); + return leafs_url; }, }, }, }); $('#refreshTree').on('click', () => { - window.jsTree.jstree('refresh'); + if (window.jsTree.jstree) { + window.jsTree.jstree('refresh'); + } else if (window.jsTree.refresh) { + window.jsTree.refresh(); + } }); if (parent.frames && parent.frames.detail) { @@ -93,7 +100,11 @@ window.addEventListener( if (data.reload_browser && globalThis.jsTree) { try { - jsTree.jstree('refresh'); + if (window.jsTree.jstree) { + window.jsTree.jstree('refresh'); + } else if (window.jsTree.refresh) { + window.jsTree.refresh(); + } } catch (err) { console.warn(err); } diff --git a/assets/templates/browser.twig b/assets/templates/browser.twig index a03f79a9..b7b7dbe6 100644 --- a/assets/templates/browser.twig +++ b/assets/templates/browser.twig @@ -1,24 +1,23 @@ - - {% include 'components/common_head.twig' %} + + {% include 'components/common_head.twig' %} - - - + + + - -{% include 'components/browser_body.twig' %} - + + {% include 'components/browser_body.twig' %} + - + - \ No newline at end of file + diff --git a/assets/templates/components/browser_body.twig b/assets/templates/components/browser_body.twig index dbc532fa..82fb16d0 100644 --- a/assets/templates/components/browser_body.twig +++ b/assets/templates/components/browser_body.twig @@ -1,16 +1,14 @@ +
-
+ +
+ + {{lang.strrefresh}} + +
- -
- - {{lang.strrefresh}} - -
- -
- -
+
+
diff --git a/assets/templates/components/common_body.twig b/assets/templates/components/common_body.twig index e88f382b..bf11b9e3 100644 --- a/assets/templates/components/common_body.twig +++ b/assets/templates/components/common_body.twig @@ -1,23 +1,16 @@ - {% if includeJsTree %} -
-
-
+
+
+
-
-
- {% include 'components/browser_body.twig' %} - -
-
-
-
-
- - - {% else %} - {##} - {% endif %} - \ No newline at end of file +
+
+ {% include 'components/browser_body.twig' %} + +
+
+
+
+
+ + \ No newline at end of file diff --git a/assets/templates/components/common_head.twig b/assets/templates/components/common_head.twig index 569033dc..ace59995 100644 --- a/assets/templates/components/common_head.twig +++ b/assets/templates/components/common_head.twig @@ -1,70 +1,53 @@ - + {% set development_assets = true %} - - - - - - + + + + + + - - - -{% if headertemplate == 'header_datatables.twig' %} - - - - - {% endif %} - {% if headertemplate == 'header_select2.twig' %} - - - - {% endif %} - {% if headertemplate == 'header_highlight.twig' %} - - - {% endif %} - + {{ script|raw -}} +}} + - + globalThis.stateObj = { +{% for key, value in params %} +'{{ key }}' : "{{ value }}", +{% endfor %} +dir: '{{ lang.applangdir }}', +in_test: '{{ in_test }}', +reload: '{{ reload }}', +method: '{{ METHOD }}', +subfolder:'{{ subfolder }}', +path:"{{ path }}", +query_string:"{{ query_string }}", +strconfdropcred:"{{ lang.strconfdropcred }}", +origin: globalThis.location.origin, +url:"{{ url }}", +href: globalThis.location.href, +guessedSubfolder: ('' + globalThis.location.pathname).replace("/ {{ path }}", ''), +pathname: globalThis.location.pathname +}; + - {{ appName }}{{ title }} + {{ appName }}{{ title }} diff --git a/assets/templates/components/tabs.twig b/assets/templates/components/tabs.twig index 98b951ba..cc70c994 100644 --- a/assets/templates/components/tabs.twig +++ b/assets/templates/components/tabs.twig @@ -1,19 +1,21 @@
- - {% for tab in tabs %} -
- - {% if tab.iconurl %} - {{tab.title}} - {% endif %} - {{tab.title}} - {% if tab.helpurl %} - {{lang.strhelpicon}} {% endif %} -
+ {% for tab in tabs %} + +
+ + {% if tab.iconurl %} + {{tab.title}} + {% endif %} + {{tab.title}} + + {% if tab.helpurl %} + {{lang.strhelpicon}} + {% endif %} +
+ + {% endfor %} - {% endfor %} -
-
 
\ No newline at end of file +
 
diff --git a/assets/templates/components/trail.twig b/assets/templates/components/trail.twig index 90530259..6353f92f 100644 --- a/assets/templates/components/trail.twig +++ b/assets/templates/components/trail.twig @@ -1,49 +1,52 @@
- - - - {% for crumb in crumbs %} +
+ + + {% for crumb in crumbs %} - - {% endfor %} - - -
- - - {{crumb.iconalt}} - - {{crumb.text}} - {% if crumb.helpurl %} - {{lang.strhelpicon}} {% endif %} {{lang.strseparator}} -
- {% if search_paths %} - - - - - {% for crumb in search_paths %} - - + {% endfor %} + + +
- {{lang.strsearchpath}} - - | - + + {{crumb.iconalt}} {{crumb.text}} + {% if crumb.helpurl %} + {{lang.strhelpicon}} + {% endif %} + {{lang.strseparator}} +
+ {% if search_paths %} + + + + + {% for crumb in search_paths %} + + - {% endfor %} - - - -
+ {{lang.strsearchpath}} + + | + + + {{crumb.iconalt}} + + {{crumb.text}} + - -    -
- {% endif %} + + {% endfor %} + +    + + + + + {% endif %} -
\ No newline at end of file +
diff --git a/assets/templates/deprecated.iframe_view.twig b/assets/templates/deprecated.iframe_view.twig deleted file mode 100644 index ee8f4d10..00000000 --- a/assets/templates/deprecated.iframe_view.twig +++ /dev/null @@ -1,18 +0,0 @@ -{% include 'header.twig' %} - - -
-
-
- - -
- - - -
- {% include 'footer_iframe.twig' %} \ No newline at end of file diff --git a/assets/templates/footer.twig b/assets/templates/footer.twig index 41b4f59f..012f1a43 100644 --- a/assets/templates/footer.twig +++ b/assets/templates/footer.twig @@ -1,35 +1,29 @@ {{script_footer|raw}} - {% if print_bottom_link == true %} -{{lang.strgotoppage}} {% endif %} +{% if print_bottom_link == true %} + {{lang.strgotoppage}} +{% endif %} - - - - - \ No newline at end of file + diff --git a/assets/templates/footer_iframe.twig b/assets/templates/footer_iframe.twig deleted file mode 100644 index a958348c..00000000 --- a/assets/templates/footer_iframe.twig +++ /dev/null @@ -1,26 +0,0 @@ - - - - \ No newline at end of file diff --git a/assets/templates/header.twig b/assets/templates/header.twig index 040505ba..f233670c 100644 --- a/assets/templates/header.twig +++ b/assets/templates/header.twig @@ -1,8 +1,30 @@ - + - - {% include 'components/common_head.twig' %} + + {% include 'components/common_head.twig' %} - - \ No newline at end of file + + + + +{% if headertemplate == 'header_datatables.twig' %} + + + + +{% endif %} +{% if headertemplate == 'header_select2.twig' %} + + + +{% endif %} +{% if headertemplate == 'header_highlight.twig' %} + + + +{% endif %} + + + + diff --git a/assets/templates/header_sqledit.twig b/assets/templates/header_sqledit.twig index 5203b56c..79bbc82a 100644 --- a/assets/templates/header_sqledit.twig +++ b/assets/templates/header_sqledit.twig @@ -1,17 +1,14 @@ - + - - - {% include 'components/common_head.twig' %} - - - - - - + {% include 'components/common_head.twig' %} + + + + - \ No newline at end of file + + diff --git a/assets/templates/intro_view.twig b/assets/templates/intro_view.twig index 9b69abec..b9161db9 100644 --- a/assets/templates/intro_view.twig +++ b/assets/templates/intro_view.twig @@ -1,23 +1,23 @@ {% include 'header.twig' %} - -
-
-
-
-
- {% include 'components/browser_body.twig' %} - -
-
-
+
+
+
+
+
+ {% include 'components/browser_body.twig' %} + + +
+
+
+ +