From 647db5d364313da2fd7401cb67495350cd3b6a51 Mon Sep 17 00:00:00 2001 From: Zac Spitzer Date: Thu, 15 Apr 2021 01:47:04 +0200 Subject: [PATCH] improve the admin extensions experience - fix update notification (route thru web.cfm) - fix some css linting issues - darken TD text colour Extensions List - by default show all available extensions Extension detail page - show the extension release status in red on - show category for installed extension --- .../context/admin/ext.applications.detail.cfm | 50 +++++-- .../context/admin/ext.applications.list.cfm | 137 ++++++++---------- .../main/cfml/context/admin/ext.functions.cfm | 4 +- core/src/main/cfml/context/admin/overview.cfm | 3 +- .../context/admin/resources/language/en.xml | 1 + core/src/main/cfml/context/admin/update.cfm | 10 +- core/src/main/cfml/context/admin/web.cfm | 2 +- core/src/main/cfml/context/res/css/admin6.css | 28 ++-- .../context/admin/resources/language/de.xml | 6 +- .../context/admin/resources/language/en.xml | 3 + loader/build.xml | 2 +- loader/pom.xml | 2 +- 12 files changed, 134 insertions(+), 114 deletions(-) diff --git a/core/src/main/cfml/context/admin/ext.applications.detail.cfm b/core/src/main/cfml/context/admin/ext.applications.detail.cfm index ca05e13d81..5e9612a432 100644 --- a/core/src/main/cfml/context/admin/ext.applications.detail.cfm +++ b/core/src/main/cfml/context/admin/ext.applications.detail.cfm @@ -44,10 +44,11 @@ // order toOrderedArray(all,true); - versionStr = {}; - versionStr.snapShot = []; - versionStr.pre_release = []; - versionStr.release = []; + versionStr = { + snapShot: [], + pre_release: [], + release: [] + }; if(len(all)){ for(versions in all ){ if(FindNoCase("SNAPSHOT", versions)){ @@ -59,6 +60,15 @@ } } } + if (arrayLen(versionStr.release) gt 0) + ext_status="Released"; + else if (arrayLen(versionStr.pre_release)) + ext_status="Pre Release"; + else if (arrayLen(versionStr.snapshot)) + ext_status="Snapshot"; + else + ext_status="Not Available"; + @@ -87,10 +97,11 @@ - +

#app.name# (#stText.ext.installed##stText.ext.installedServer##stText.ext.notInstalled#)

+
This extension is not provided by the Lucee Association Switzerland and does not neccessarily follow our guidelines. This extension is not reviewed by the Lucee Association Switzerland. For any sugestion to improve the Extension or any issue you encounter, please contact the author of the extension directly.
@@ -102,8 +113,6 @@

- - @@ -120,6 +129,10 @@
+ + + + @@ -136,13 +149,19 @@ - + + + + + + + @@ -157,6 +176,11 @@ + + + + + @@ -232,7 +256,7 @@ if(isInstalled) installedVersion=toVersionSortable(installed.version); -
#stText.ext.releaseStatus##ext_status#
Type #installed.trial?"Trial":"Full"# Version
#stText.ext.category##arrayToList(installed.categories,', ')#
#stText.ext.availableVersion# #arrayToList(all,', ')#
#stText.ext.category# #available.category#
#stText.ext.category##arrayToList(installed.categories,', ')#
+
@@ -335,13 +359,7 @@ if(isInstalled) installedVersion=toVersionSortable(installed.version); else $( "##versionForm" ).submit(); } - - + diff --git a/core/src/main/cfml/context/admin/ext.applications.list.cfm b/core/src/main/cfml/context/admin/ext.applications.list.cfm index 633cb9df8f..5db966037e 100644 --- a/core/src/main/cfml/context/admin/ext.applications.list.cfm +++ b/core/src/main/cfml/context/admin/ext.applications.list.cfm @@ -99,12 +99,10 @@ } } dn=getDumpNail(img,130,50); -
- - - + +
href="#link#"style="border-color: ##E0E0E0;" title="#_extensions.name# -Categories: #arrayToList(cat)# +#arrayToList(cat)# Installed version: #_extensions.version# Latest version: #latest.v#">
style="border-color:##bf4f36">
style="background-color:##bf4f36">UPDATE ME!
@@ -234,19 +232,18 @@ Latest version: #latest.v#"> - - - class="bl button" class="br button" class="bm button" - style="width:180px" - name="changeConnection" - id="btn_#UcFirst(Lcase(key))#" - value="#stText.services.update.short[key]# (#versionStr[key].RecordCount#)" - onclick="enableVersion('#UcFirst(Lcase(key))#');" - type="button"> - -
- +
+ + class="bl btn button" class="br btn button" class="bm btn button" + style="width:180px" + name="changeConnection" + id="btn_#UcFirst(Lcase(key))#" + value="#stText.services.update.short[key]# (#versionStr[key].RecordCount#)" + onclick="enableVersion('#UcFirst(Lcase(key))#');" + type="button"> + + "> or doFilter(session.extFilter.filter2,info.title?:'',false) ) > - - -
+ + link="?action=#url.action#&action2=detail&id=#versionStr[key].id#"; + latest=getLatestVersion(versionStr[key].id); + dn=getDumpNail(versionStr[key].image,130,50); + +
- style="border-color: ###(lasProvider?'9C9':'FC6')#;" href="#link#" title="#stText.ext.viewdetails#"> + style="border-color: ###(lasProvider?'9C9':'FC6')#;" href="#link#" + title="#versionStr[key].name# +#arrayToList(cat)# +Latest version: #latest.v# +">
- - #stText.ext.extThumbnail# + #stText.ext.extThumbnail#
#cut(versionStr[key].name,30)#
- #versionStr[key].price# #versionStr[key].currency#USD#stText.ext.free# + #versionStr[key].price# + #versionStr[key].currency#USD#stText.ext.free#
-
- - - - - + + + + +
#hiddenFormContents#
@@ -333,51 +336,37 @@ Latest version: #latest.v#"> diff --git a/core/src/main/cfml/context/admin/ext.functions.cfm b/core/src/main/cfml/context/admin/ext.functions.cfm index 5d38c3ab29..998a58bee0 100644 --- a/core/src/main/cfml/context/admin/ext.functions.cfm +++ b/core/src/main/cfml/context/admin/ext.functions.cfm @@ -61,6 +61,8 @@ + + @@ -148,7 +150,7 @@ - + diff --git a/core/src/main/cfml/context/admin/overview.cfm b/core/src/main/cfml/context/admin/overview.cfm index df3a408a6f..11efc79a2a 100644 --- a/core/src/main/cfml/context/admin/overview.cfm +++ b/core/src/main/cfml/context/admin/overview.cfm @@ -439,8 +439,7 @@ Error Output ---> diff --git a/core/src/main/cfml/context/admin/resources/language/en.xml b/core/src/main/cfml/context/admin/resources/language/en.xml index a63441710e..9f978f52be 100755 --- a/core/src/main/cfml/context/admin/resources/language/en.xml +++ b/core/src/main/cfml/context/admin/resources/language/en.xml @@ -313,6 +313,7 @@ Version Update Release Date + Release Status Available to Install Code Name Step {current} of {total} diff --git a/core/src/main/cfml/context/admin/update.cfm b/core/src/main/cfml/context/admin/update.cfm index 55403ebeb1..73099748ea 100755 --- a/core/src/main/cfml/context/admin/update.cfm +++ b/core/src/main/cfml/context/admin/update.cfm @@ -13,7 +13,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . * - ---> + ---> @@ -109,9 +109,9 @@ - + - - #extensions.name#
+ - #extensions.name# #extensions.version#
 @@ -206,4 +206,6 @@
---> - \ No newline at end of file + + + \ No newline at end of file diff --git a/core/src/main/cfml/context/admin/web.cfm b/core/src/main/cfml/context/admin/web.cfm index 4235fb736e..65bac483fe 100755 --- a/core/src/main/cfml/context/admin/web.cfm +++ b/core/src/main/cfml/context/admin/web.cfm @@ -542,7 +542,7 @@ - + diff --git a/core/src/main/cfml/context/res/css/admin6.css b/core/src/main/cfml/context/res/css/admin6.css index 5d5f4d3cf2..224d765be0 100644 --- a/core/src/main/cfml/context/res/css/admin6.css +++ b/core/src/main/cfml/context/res/css/admin6.css @@ -423,7 +423,7 @@ td, th { } th {/* like .tblHead */ background-color:#36c; /* ABC */ - color:#999; + color:#333; font-weight:normal; text-align:left; } @@ -451,16 +451,16 @@ tr.notOK td {background-color:#f9e0e0;} } .maintbl th { - padding: 3px 5px; + padding: 5px 5px; font-weight:normal; empty-cells:show; margin: 10px; border-radius: 4px; background-color:#f1f0f5; box-shadow: 0px 1px 1px 0px #d9dade, - -1px 0px 1px 0px #d9dade, - 1px 0px 1px 0px #d9dade, - 0px -2px 2px 0px #fcfcfc ; + -1px 0px 1px 0px #d9dade, + 1px 0px 1px 0px #d9dade, + 0px -2px 2px 0px #fcfcfc ; } .maintbl td { padding: 3px 5px; @@ -471,9 +471,9 @@ tr.notOK td {background-color:#f9e0e0;} background-color:#fff; border-radius: 4px; box-shadow: 0px 1px 1px 0px #d9dade, - -1px 0px 1px 0px #d9dade, - 1px 0px 1px 0px #d9dade, - 0px -2px 2px 0px #fcfcfc ; + -1px 0px 1px 0px #d9dade, + 1px 0px 1px 0px #d9dade, + 0px -2px 2px 0px #fcfcfc ; } .longwords { word-break:break-all; @@ -748,6 +748,11 @@ body.web .btn { background-color:#0f75a8; } +.version-selector .btn, .extension .extension-status { + color:white; + background-color:#CC0000; +} + .btn-mini { display:inline-block; outline:none; @@ -1028,7 +1033,6 @@ div.percentagebar span { height:100%; font-size: 10px; } -} div.percentagebar span { position: absolute; @@ -1055,7 +1059,7 @@ div.percentagebar span { margin:10px 0px; border:1px solid #dcdad3; background-color:rgba(255,255,255,0.7); - color:#3c3e40 + color:#3c3e40; -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; @@ -1150,6 +1154,7 @@ tbody#extproviderlist td { -moz-transform: rotate(40deg); -ms-transform: rotate(40deg); -o-transform: rotate(40deg); + transform: rotate(40deg); position: relative; padding: 2px 0; left: -20px; @@ -1183,6 +1188,7 @@ tbody#extproviderlist td { -moz-transform: rotate(40deg); -ms-transform: rotate(40deg); -o-transform: rotate(40deg); + transform: rotate(40deg); position: relative; padding: 2px 0; left: -20px; @@ -1356,7 +1362,7 @@ div.tooltip { .syntaxTag, .syntaxFunc{color:#993300;} .syntaxText {color:#36c;} .syntaxAttr {color:#000099;} -.syntaxType {color:##000099;} +.syntaxType {color: #000099;} body { margin: 0; padding: 0; } diff --git a/core/src/main/java/resource/context/admin/resources/language/de.xml b/core/src/main/java/resource/context/admin/resources/language/de.xml index 1a98e45cd6..045ee66d8a 100644 --- a/core/src/main/java/resource/context/admin/resources/language/de.xml +++ b/core/src/main/java/resource/context/admin/resources/language/de.xml @@ -15,7 +15,7 @@ Installierte Patches Automatisch Patches entfernen - Spielen Sie die aktuellsten Pacthes für Ihre Version ein. Nach einem erfolgten Update, müssen Sie sich neu in den Administrator einloggen. + Spielen Sie die aktuellsten Patches für Ihre Version ein. Nach einem erfolgten Update, müssen Sie sich neu in den Administrator einloggen. Für Ihre Version steht ein Patch zur Verfügung, Sie haben die Version {current} installiert, die aktuell verfügbare Version ist {available} Info Hier können Sie Lucee neu starten. @@ -670,13 +670,13 @@ Diese werden dann am Ende eines Request ausgegeben, falls sie ein Debug Template Select this option to show timer event information. Timers let a developer track the execution time of the code between the start and end tags of the CFTIMER tag. Implicit variable Access Select this option to log all accesses to scopes, queries and threads that happens implicit (cascaded). + Scope Lookups Debug Threads Select this option to also log out individual threads. Depending on your application, this may produce a large volume of debug entries. - Switch Debug Template Select Debug Template - + Enabled Null Support diff --git a/core/src/main/java/resource/context/admin/resources/language/en.xml b/core/src/main/java/resource/context/admin/resources/language/en.xml index 7450df48ae..9f978f52be 100644 --- a/core/src/main/java/resource/context/admin/resources/language/en.xml +++ b/core/src/main/java/resource/context/admin/resources/language/en.xml @@ -313,6 +313,7 @@ Version Update Release Date + Release Status Available to Install Code Name Step {current} of {total} @@ -768,6 +769,7 @@ you can see the log result at the end of every request, if a debug template is d Only Outputs records where the path match the following pattern. Detail Detailed information about a single Request + Scope Lookups Switch Debug Template Select Debug Template @@ -1296,6 +1298,7 @@ If the timezone of your Lucee instance and your database is different, this can Documentation If you have any questions about Lucee please take a look at the documentation in the first instance. Online Documentation + Click to install - Lucee Documentation Extension Local Reference Issue Tracker If you think you've found a bug, please take the time to report it via our bug tracking system. diff --git a/loader/build.xml b/loader/build.xml index 07ba299b59..17dcbafbb7 100644 --- a/loader/build.xml +++ b/loader/build.xml @@ -1,7 +1,7 @@ - + org.lucee lucee - 6.0.0.89-SNAPSHOT + 6.0.0.90-SNAPSHOT jar Lucee Loader Build