From ddd41936f1c5529197d69fa146a0280970aa9117 Mon Sep 17 00:00:00 2001 From: Dave Johnson Date: Mon, 29 Dec 2014 10:11:22 -0500 Subject: [PATCH 001/122] Update README.txt Couple of notes about my fork of Roller. --- README.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.txt b/README.txt index fcf2b0838c..ad9cc191fd 100644 --- a/README.txt +++ b/README.txt @@ -1,5 +1,19 @@ README.txt + +This is my personal and experimental fork of Apache Roller. +There are two experiments here: + +1) shiro_not_spring: is a branch of Roller's trunk that has been modified to use +Apache Shiro for security instead of Spring. Also, all Spring depdenencies have been removed. + +2) jaxrs_not_struts: is a branch of Roller's trunk that has been modified to add +a REST API, powered by Apache CXF and Apache Shiro. Someday this REST API could power +a new JavaScript based web interface for Roller. + + +---------------------------------------------------------- + This file exists at the top-level of the Roller source tree. Roller is made up of the following Maven projects: From 76d87c2835275616bcad3fffc339b9042723923a Mon Sep 17 00:00:00 2001 From: Dave Johnson Date: Fri, 2 Jan 2015 13:05:40 -0500 Subject: [PATCH 002/122] Better notes about the fork. --- README.md | 33 ++++++++++++ README.txt | 63 ---------------------- app/roller-webapp.iml | 118 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 151 insertions(+), 63 deletions(-) create mode 100644 README.md delete mode 100644 README.txt create mode 100644 app/roller-webapp.iml diff --git a/README.md b/README.md new file mode 100644 index 0000000000..c113dae7b1 --- /dev/null +++ b/README.md @@ -0,0 +1,33 @@ +README.txt +=== + +This is my personal and experimental fork of Apache Roller. +There are two experiments here: + +1) shiro_not_spring: is a branch of Roller's trunk that has been modified to use +Apache Shiro for security instead of Spring. Also, all Spring depdenencies have been removed. + +2) jaxrs_not_struts: is a branch of Roller's trunk that has been modified to add +a REST API, powered by Apache CXF and Apache Shiro. Someday this REST API could power +a new JavaScript based web interface for Roller. + +README.txt +=== + +This is Rollarcus: my experimental fork of [Apache Roller](https://github.com/apache/roller). +So far, there are two experiments here: + +1) [https://github.com/snoopdave/rollarcus/tree/shiro_not_spring(shiro_not_spring): is a branch of Roller's trunk +that has been modified to use Apache Shiro for security instead of Spring. Also, all Spring depdenencies have been +removed. + +2) [https://github.com/snoopdave/rollarcus/tree/jaxrs_not_struts](jaxrs_not_struts): is a branch of Roller's +trunk that has been modified to add a REST API, powered by Apache CXF and Apache Shiro. Someday this REST API +could power a new JavaScript based web interface for Roller. + + +That's all +--- + +Want to contribute? Shoot me a PR. + diff --git a/README.txt b/README.txt deleted file mode 100644 index ad9cc191fd..0000000000 --- a/README.txt +++ /dev/null @@ -1,63 +0,0 @@ -README.txt - - -This is my personal and experimental fork of Apache Roller. -There are two experiments here: - -1) shiro_not_spring: is a branch of Roller's trunk that has been modified to use -Apache Shiro for security instead of Spring. Also, all Spring depdenencies have been removed. - -2) jaxrs_not_struts: is a branch of Roller's trunk that has been modified to add -a REST API, powered by Apache CXF and Apache Shiro. Someday this REST API could power -a new JavaScript based web interface for Roller. - - ----------------------------------------------------------- - -This file exists at the top-level of the Roller source tree. - -Roller is made up of the following Maven projects: - - roller-project: Top level project - app: Roller Weblogger webapp, JSP pages, Velocity templates - assembly-release: Used to create official distributions of Roller - docs: Roller documentation in ODT (OpenOffice/LibreOffice) format - it-selenium Integrated browser tests for Roller using Selenium - -To pull the latest trunk sources you need a Subversion client: - svn co https://svn.apache.org/repos/asf/roller/trunk roller_trunk - -Building this version of Roller requires Apache Maven 3.0.5. - - How to build Roller: https://cwiki.apache.org/confluence/x/EM4 - - To build and run Roller on Eclipse: https://cwiki.apache.org/confluence/x/EM4 - ----------------------------------------------------------- -How to build the source - -The normal Roller build creates a product generically suitable for use several -application containers, however see the Roller Install guide for application server -specific configuration information. - -After pulling the source tree and changing directory to its top level, as -indicated above, the following command will build and run all unit tests: - - mvn clean install - -After doing that, you should find the newly built Roller webapp, suitable -for use in app/target/roller. - -To build Roller, subsequently run "mvn clean install" from the assembly-release -folder. After that, you'll find Roller distribution files in -assembly-release/target. - ---------------------------- -NOTES - -Building other versions of Roller - -If you wish to pull a branch other than the trunk, replace the word -"trunk" in both lines above with the appropriate branch name. Note that -versions of Roller before 5.0 have an Ant-based build. In general, you should -be able to follow instructions accompanying the sources that you pull in order -to build that version. - diff --git a/app/roller-webapp.iml b/app/roller-webapp.iml new file mode 100644 index 0000000000..3ff24c6a0a --- /dev/null +++ b/app/roller-webapp.iml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 1cbd3dc6f1d828b1720ab357daf3342e4657aead Mon Sep 17 00:00:00 2001 From: Dave Johnson Date: Fri, 2 Jan 2015 13:10:17 -0500 Subject: [PATCH 003/122] Remove duplicate text, fix links. --- README.md | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index c113dae7b1..cc850fd373 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,14 @@ -README.txt +README.md === -This is my personal and experimental fork of Apache Roller. -There are two experiments here: - -1) shiro_not_spring: is a branch of Roller's trunk that has been modified to use -Apache Shiro for security instead of Spring. Also, all Spring depdenencies have been removed. - -2) jaxrs_not_struts: is a branch of Roller's trunk that has been modified to add -a REST API, powered by Apache CXF and Apache Shiro. Someday this REST API could power -a new JavaScript based web interface for Roller. - -README.txt -=== - -This is Rollarcus: my experimental fork of [Apache Roller](https://github.com/apache/roller). +This is __Rollarcus__: my experimental fork of [Apache Roller](https://github.com/apache/roller). So far, there are two experiments here: -1) [https://github.com/snoopdave/rollarcus/tree/shiro_not_spring(shiro_not_spring): is a branch of Roller's trunk -that has been modified to use Apache Shiro for security instead of Spring. Also, all Spring depdenencies have been -removed. +1) [shiro_not_spring](https://github.com/snoopdave/rollarcus/tree/shiro_not_spring): is a +branch of Roller's trunk that has been modified to use Apache Shiro for security instead of Spring. +Also, all Spring depdenencies have been removed. -2) [https://github.com/snoopdave/rollarcus/tree/jaxrs_not_struts](jaxrs_not_struts): is a branch of Roller's +2) [jaxrs_not_struts](https://github.com/snoopdave/rollarcus/tree/jaxrs_not_struts): is a branch of Roller's trunk that has been modified to add a REST API, powered by Apache CXF and Apache Shiro. Someday this REST API could power a new JavaScript based web interface for Roller. From d7eaa93ddc38625e7860b87ce899c3d5d783eb77 Mon Sep 17 00:00:00 2001 From: Dave Johnson Date: Fri, 2 Jan 2015 13:11:02 -0500 Subject: [PATCH 004/122] Remove unnecessary text. --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index cc850fd373..1dcb1e099d 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,4 @@ trunk that has been modified to add a REST API, powered by Apache CXF and Apache could power a new JavaScript based web interface for Roller. -That's all ---- - -Want to contribute? Shoot me a PR. From 61cf7e3ef942300556525d00e627d5f1d3383b80 Mon Sep 17 00:00:00 2001 From: Dave Johnson Date: Fri, 2 Jan 2015 13:11:43 -0500 Subject: [PATCH 005/122] title Rollarcus --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1dcb1e099d..e3dc7d9dda 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -README.md +Rollarcus === This is __Rollarcus__: my experimental fork of [Apache Roller](https://github.com/apache/roller). From 0364bc9da215e5b7af172e0956fb98a8b604a1bc Mon Sep 17 00:00:00 2001 From: "David M. Johnson" Date: Fri, 2 Jan 2015 13:49:30 -0500 Subject: [PATCH 006/122] Update README.md more details --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e3dc7d9dda..39aaf02528 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,9 @@ branch of Roller's trunk that has been modified to use Apache Shiro for security Also, all Spring depdenencies have been removed. 2) [jaxrs_not_struts](https://github.com/snoopdave/rollarcus/tree/jaxrs_not_struts): is a branch of Roller's -trunk that has been modified to add a REST API, powered by Apache CXF and Apache Shiro. Someday this REST API -could power a new JavaScript based web interface for Roller. +trunk that has been modified to add a REST API, powered by Apache CXF, Apache Shiro and includes Arquillian-powered +tests for the REST API. Someday this REST API could power a new JavaScript based web interface for Roller +and allow the project to move on from Struts. From 8f9d134249864f6aabb07cdc685c5f09eb5173d2 Mon Sep 17 00:00:00 2001 From: "David M. Johnson" Date: Sat, 3 Jan 2015 15:13:21 -0500 Subject: [PATCH 007/122] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 39aaf02528..73c76e441d 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ Rollarcus === -This is __Rollarcus__: my experimental fork of [Apache Roller](https://github.com/apache/roller). -So far, there are two experiments here: +This is Rollarcus: an __experimental fork of [Apache Roller](https://github.com/apache/roller)__. +So far, there are two experiments here, each in its own branch: 1) [shiro_not_spring](https://github.com/snoopdave/rollarcus/tree/shiro_not_spring): is a branch of Roller's trunk that has been modified to use Apache Shiro for security instead of Spring. From 35c2b8de4654242aa77e875c455cae896987cd80 Mon Sep 17 00:00:00 2001 From: Dave Johnson Date: Wed, 16 Dec 2015 09:41:41 -0500 Subject: [PATCH 008/122] Did not mean to commit this. --- app/roller-webapp.iml | 118 ------------------------------------------ 1 file changed, 118 deletions(-) delete mode 100644 app/roller-webapp.iml diff --git a/app/roller-webapp.iml b/app/roller-webapp.iml deleted file mode 100644 index 3ff24c6a0a..0000000000 --- a/app/roller-webapp.iml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 624ad3b21f1824bbc01bbfa2423e86fe2ca62f44 Mon Sep 17 00:00:00 2001 From: Dave Johnson Date: Wed, 16 Dec 2015 10:53:56 -0500 Subject: [PATCH 009/122] Texan will fail if these directories are not present. --- app/src/main/resources/sql/db2/.gitkeep | 0 app/src/main/resources/sql/derby/.gitkeep | 0 app/src/main/resources/sql/mssql/.gitkeep | 0 app/src/main/resources/sql/mysql/.gitkeep | 0 app/src/main/resources/sql/oracle/.gitkeep | 0 app/src/main/resources/sql/postgresql/.gitkeep | 0 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/src/main/resources/sql/db2/.gitkeep create mode 100644 app/src/main/resources/sql/derby/.gitkeep create mode 100644 app/src/main/resources/sql/mssql/.gitkeep create mode 100644 app/src/main/resources/sql/mysql/.gitkeep create mode 100644 app/src/main/resources/sql/oracle/.gitkeep create mode 100644 app/src/main/resources/sql/postgresql/.gitkeep diff --git a/app/src/main/resources/sql/db2/.gitkeep b/app/src/main/resources/sql/db2/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/src/main/resources/sql/derby/.gitkeep b/app/src/main/resources/sql/derby/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/src/main/resources/sql/mssql/.gitkeep b/app/src/main/resources/sql/mssql/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/src/main/resources/sql/mysql/.gitkeep b/app/src/main/resources/sql/mysql/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/src/main/resources/sql/oracle/.gitkeep b/app/src/main/resources/sql/oracle/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/src/main/resources/sql/postgresql/.gitkeep b/app/src/main/resources/sql/postgresql/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 From 2da6c3c2e28419f68244e0c362c15be96013d5f9 Mon Sep 17 00:00:00 2001 From: Dave Johnson Date: Mon, 21 Dec 2015 10:40:29 -0500 Subject: [PATCH 010/122] Beginnings of a Bootstrap rewrite of the Roller editor/admin UI, using Struts-Bootstrap plugin. The main menu and edit weblog page are essentially complete. --- app/pom.xml | 6 + .../resources/ApplicationResources.properties | 21 +- .../main/webapp/WEB-INF/jsps/core/Login.jsp | 230 +- .../webapp/WEB-INF/jsps/core/MainMenu.jsp | 235 +- .../WEB-INF/jsps/core/MainMenuSidebar.jsp | 36 +- .../webapp/WEB-INF/jsps/editor/EntryEdit.jsp | 591 +- .../WEB-INF/jsps/editor/EntryEditor.jsp | 76 +- .../WEB-INF/jsps/editor/MediaFileAdd.jsp | 1 - .../webapp/WEB-INF/jsps/taglibs-struts2.jsp | 12 +- .../WEB-INF/jsps/tiles/bannerStatus.jsp | 118 +- .../webapp/WEB-INF/jsps/tiles/head-ajax.jsp | 21 +- .../main/webapp/WEB-INF/jsps/tiles/head.jsp | 21 +- .../main/webapp/WEB-INF/jsps/tiles/menu.jsp | 76 +- .../WEB-INF/jsps/tiles/tiles-mainmenupage.jsp | 80 +- .../WEB-INF/jsps/tiles/tiles-simplepage.jsp | 61 +- .../WEB-INF/jsps/tiles/tiles-tabbedpage.jsp | 82 +- .../webapp/WEB-INF/jsps/tiles/userStatus.jsp | 38 + app/src/main/webapp/WEB-INF/tiles.xml | 54 +- .../css/bootstrap-theme.css | 587 ++ .../css/bootstrap-theme.min.css | 6 + .../bootstrap-3.3.6-dist/css/bootstrap.css | 6760 +++++++++++++++++ .../css/bootstrap.min.css | 6 + .../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20127 bytes .../fonts/glyphicons-halflings-regular.svg | 288 + .../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 45404 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23424 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes .../bootstrap-3.3.6-dist/js/bootstrap.js | 2363 ++++++ .../bootstrap-3.3.6-dist/js/bootstrap.min.js | 7 + .../roller-ui/bootstrap-3.3.6-dist/js/npm.js | 13 + .../main/webapp/roller-ui/styles/roller.css | 821 +- 31 files changed, 11081 insertions(+), 1529 deletions(-) create mode 100644 app/src/main/webapp/WEB-INF/jsps/tiles/userStatus.jsp create mode 100644 app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/css/bootstrap-theme.css create mode 100644 app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css create mode 100644 app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/css/bootstrap.css create mode 100644 app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/css/bootstrap.min.css create mode 100644 app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.eot create mode 100644 app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.svg create mode 100644 app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.ttf create mode 100644 app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.woff create mode 100644 app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.woff2 create mode 100644 app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/js/bootstrap.js create mode 100644 app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/js/bootstrap.min.js create mode 100644 app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/js/npm.js diff --git a/app/pom.xml b/app/pom.xml index 7266ad94ab..9adfed9478 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -261,6 +261,12 @@ 2.3.16.3 + + com.jgeppert.struts2.bootstrap + struts2-bootstrap-plugin + 2.0.3 + + xml-security xmlsec diff --git a/app/src/main/resources/ApplicationResources.properties b/app/src/main/resources/ApplicationResources.properties index 0a2f8c5cb0..2b753ce847 100644 --- a/app/src/main/resources/ApplicationResources.properties +++ b/app/src/main/resources/ApplicationResources.properties @@ -640,9 +640,9 @@ issued during the upgrade process: # ----------------------------------------------------------------------- Login loginPage.title=Welcome to Roller -loginPage.prompt=Please enter your username and password to login. -loginPage.openIdPrompt=Please login via OpenID -loginPage.openIdHybridPrompt=Or, login with your username and password +loginPage.prompt=Please login +loginPage.openIdPrompt=Login with OpenID +loginPage.openIdHybridPrompt=Or with username loginPage.userName=Username loginPage.password=Password loginPage.openID=OpenID username @@ -707,8 +707,8 @@ macro.weblog.noEntriesForCategory=No entries found for specified category mainPage.category=Category mainPage.searchWeblogs=Search for blogs mainPage.actions=Actions -mainPage.loggedInAs=logged in as -mainPage.currentWebsite=editing weblog +mainPage.loggedInAs=Logged in as +mainPage.currentWebsite=Editing weblog mainPage.mainMenu=Main Menu # ------------------------------------------------------------------ Maintenance @@ -1493,7 +1493,7 @@ weblogEdit.publishedEntries=Recent Entries weblogEdit.post=Post to Weblog weblogEdit.permaLink=Permalink weblogEdit.published=Published -weblogEdit.pubTime=Pub Time  +weblogEdit.pubTime=Publishing Time weblogEdit.save=Save as Draft weblogEdit.scheduled=Scheduled weblogEdit.scheduledEntries=Scheduled Entries @@ -1749,19 +1749,20 @@ activate your user account by clicking the link that is sent to you via e-mail. # ---------------------------------------------------------------- Your Weblogs -yourWebsites.title=Main Menu - yourWebsites.actions=Actions +yourWebsites.title=Your Weblogs +yourWebsites.actions=Actions -yourWebsites.prompt.noBlog=You''ve got a user account, but no weblog. \ +yourWebsites.prompt.noBlog=You have a user account, but no weblog. \ Would you like to yourWebsites.createOne=create one? -yourWebsites.prompt.hasBlog=Select a weblog to edit, manage, or configure. +yourWebsites.prompt.hasBlog=Access your weblogs here or create a new one. yourWebsites.accept=accept yourWebsites.decline=decline yourWebsites.resign=Resign +yourWebsites.youHave=You have yourWebsites.permission=Permission yourWebsites.confirmResignation=Are you sure you wish to resign from weblog [{0}]? yourWebsites.weblog=Link diff --git a/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp b/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp index bf9914deda..fbb87dfc46 100644 --- a/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp @@ -18,150 +18,130 @@ <%-- Body of the login page, invoked from login.jsp --%> <%@ page import="org.apache.roller.weblogger.config.WebloggerConfig" %> -<%@ page import="org.apache.roller.weblogger.config.AuthMethod" %> <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> <%! -String securityCheckUrl = null; -boolean cmaEnabled = "CMA".equals(WebloggerConfig.getAuthMethod()); + String securityCheckUrl = null; + boolean cmaEnabled = "CMA".equals( WebloggerConfig.getAuthMethod() ); %> <% -if (cmaEnabled) { - securityCheckUrl = "/j_security_check"; -} else { - securityCheckUrl = "/roller_j_security_check"; -} + if (cmaEnabled) { + securityCheckUrl = "/j_security_check"; + } else { + securityCheckUrl = "/roller_j_security_check"; + } %> - - -

- -
- - - - - - - - - - -
- -
- -
-
-
- - - - -

+
+ + + + + - - -

-
- -
"/>" - onsubmit="saveUsername(this)"> - - - - - - - - - - - - + + + + + "/>" + onsubmit="saveUsername(this)"> + + + + + + + + + + + + + + - - - - + - - - - + -
- -
- -
- - -
- - -
-
- + + + + + +
\ No newline at end of file diff --git a/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp b/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp index 6b108193fd..6a5b547400 100644 --- a/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp @@ -59,123 +59,126 @@ -
- -   - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
ADMIN - AUTHOR - LIMITED
- -
- - - - - - -
- - <%-- Show Entries link with count for users above LIMITED permission --%> - - - - - - () -
-
- - <%-- Show Comments link with count for users above LIMITED permission --%> - - - - - - () -
-
- - <%-- Only admins get access to theme and config settings --%> - - - <%-- And only show theme option if custom themes are enabled --%> - - - - - - - - - - - - - - -
-
- - - - - - - -
-
- - <%-- don't allow last admin to resign from blog --%> - - - - - - - - - - -
+
+ +

+ +   +

+ +

+

+ +

+

You have + ADMIN + AUTHOR + LIMITED +

+ +
+ + <%-- New entry button --%> + + + + + <%-- Show Entries button with count for users above LIMITED permission --%> + + + + + + + <%-- Show Comments button with count for users above LIMITED permission --%> + + + + + + <%-- Only admins get access to theme and config settings --%> + + + <%-- And only show theme option if custom themes are enabled --%> + + + + + <%-- Templates button --%> + + + + + + <%-- Theme edit button --%> + + + + + + + + <%-- Resign button --%> + + + + + <%-- don't allow last admin to resign from blog --%> + + + + + + +
+
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp index 4aa6ef9807..ba13272ab6 100644 --- a/app/src/main/webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp @@ -22,29 +22,47 @@