You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/08/31 03:01:38 UTC
svn commit: r1621549 - in /roller/trunk/app/src/main:
java/org/apache/roller/weblogger/ui/core/util/menu/ resources/
resources/org/apache/roller/weblogger/ui/struts2/editor/
webapp/WEB-INF/jsps/core/ webapp/WEB-INF/jsps/editor/
Author: gmazza
Date: Sun Aug 31 01:01:37 2014
New Revision: 1621549
URL: http://svn.apache.org/r1621549
Log:
Removed unused code in template & stylesheetedit.jsp; Theme and Design tabs now default to the templates page if the weblog is using a custom theme.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/Menu.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuTab.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/Menu.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/Menu.java?rev=1621549&r1=1621548&r2=1621549&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/Menu.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/Menu.java Sun Aug 31 01:01:37 2014
@@ -27,7 +27,7 @@ import java.util.List;
*/
public class Menu {
- private List tabs = new ArrayList();
+ private List<MenuTab> tabs = new ArrayList<MenuTab>();
public void addTab(MenuTab tab) {
@@ -35,11 +35,11 @@ public class Menu {
}
- public List getTabs() {
+ public List<MenuTab> getTabs() {
return tabs;
}
- public void setTabs(List menus) {
+ public void setTabs(List<MenuTab> menus) {
this.tabs = menus;
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java?rev=1621549&r1=1621548&r2=1621549&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java Sun Aug 31 01:01:37 2014
@@ -37,6 +37,7 @@ import org.apache.roller.weblogger.pojos
import org.apache.roller.weblogger.pojos.User;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.pojos.WeblogTheme;
import org.apache.roller.weblogger.util.Utilities;
import org.jdom2.Document;
import org.jdom2.Element;
@@ -149,6 +150,13 @@ public final class MenuHelper {
Menu tabMenu = new Menu();
UserManager umgr = WebloggerFactory.getWeblogger().getUserManager();
+
+ // Hack - for blogger convenience, the design tab of the edit
+ // menu defaults to the templates tab item (instead of theme edit)
+ // if the weblog is using a custom theme.
+ boolean customThemeOverride = "editor".equals(menuId)
+ && WeblogTheme.CUSTOM.equals(weblog.getEditorTheme());
+
// iterate over tabs from parsed config
for (ParsedTab configTab : menuConfig.getTabs()) {
@@ -198,34 +206,10 @@ public final class MenuHelper {
boolean firstItem = true;
boolean selectable = true;
- // See if we need to include tab item for current tab
- HashMap<String, HashSet<String>> menu = itemMenu.get(menuId);
- HashSet<String> item = null;
- if (menu != null) {
- // Should always have an item
- item = menu.get(configTab.getName());
- }
-
for (ParsedTabItem configTabItem : configTab.getTabItems()) {
- // log.debug("config tab item = " +
- // configTabItem.getName());
-
boolean includeItem = true;
- if (currentAction != null && !item.contains(currentAction)) {
- // includeItem = false;
- // Set first action on menu
- // if (firstItem) {
- tab.setAction(configTabItem.getAction());
- // firstItem = false;
- // }
- // System.out.println("skipped : "
- // + configTabItem.getAction());
- // Skip the rest of this menu
- break;
- }
-
if (configTabItem.getEnabledProperty() != null) {
includeItem = getBooleanProperty(configTabItem
.getEnabledProperty());
@@ -275,10 +259,13 @@ public final class MenuHelper {
selectable = false;
}
- // the url for the tab is the url of the first item of
- // the tab
+ // the url for the tab is the url of the first tab item
if (firstItem) {
- tab.setAction(tabItem.getAction());
+ if (customThemeOverride && "tabbedmenu.design".equals(tab.getKey())) {
+ tab.setAction("templates");
+ } else {
+ tab.setAction(tabItem.getAction());
+ }
firstItem = false;
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuTab.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuTab.java?rev=1621549&r1=1621548&r2=1621549&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuTab.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuTab.java Sun Aug 31 01:01:37 2014
@@ -30,7 +30,7 @@ public class MenuTab {
private String key = null;
private String action = null;
private boolean selected = false;
- private List items = new ArrayList();
+ private List<MenuTabItem> items = new ArrayList<MenuTabItem>();
public void addItem(MenuTabItem item) {
@@ -62,11 +62,11 @@ public class MenuTab {
this.selected = selected;
}
- public List getItems() {
+ public List<MenuTabItem> getItems() {
return items;
}
- public void setItems(List items) {
+ public void setItems(List<MenuTabItem> items) {
this.items = items;
}
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1621549&r1=1621548&r2=1621549&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Sun Aug 31 01:01:37 2014
@@ -1288,7 +1288,7 @@ custom theme you must first copy templat
themeEditor.importAndOverwriteTemplates=Also import a theme into my already existing custom templates, overwriting any with the same name.
themeEditor.importAndOverwriteTemplates.tooltip=You already have custom templates that can be used to render a blog (see Templates tab). \
Select this option to import a shared theme's templates, overwriting any of your existing templates that have the same name as the shared theme's\
- templates. Leave this unchecked to just switch from a shared to custom theme while retaining your present custom templates.
+ templates. Leave this unchecked to just switch to custom with your present templates.
themeEditor.setTheme.success=Theme set to {0}
themeEditor.setCustomTheme.success=Shared theme {0} imported into custom templates
themeEditor.setCustomTheme.instructions=Use the Stylesheet and Templates tabs above to edit your custom theme.
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml?rev=1621549&r1=1621548&r2=1621549&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml Sun Aug 31 01:01:37 2014
@@ -69,7 +69,7 @@ Each menu or menu item is governed by fo
<!-- if we already have checked weblogPerms="admin" globalPerms="login" we should -->
<!-- not need to recheck on each tab item as they are the same -->
<menu name="tabbedmenu.design" weblogPerms="admin" globalPerms="login" enabledProperty="themes.customtheme.allowed">
-
+
<!-- globalPerms="login" weblogPerms="admin" -->
<menu-item action="themeEdit"
name="tabbedmenu.website.themes" />
@@ -80,7 +80,7 @@ Each menu or menu item is governed by fo
<!-- globalPerms="login" weblogPerms="admin" -->
<menu-item action="templates"
- name="tabbedmenu.website.pages"
+ name="tabbedmenu.website.pages"
subactions="templateAdd,templateEdit,templateRemove,templatesRemove" />
</menu>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp?rev=1621549&r1=1621548&r2=1621549&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp Sun Aug 31 01:01:37 2014
@@ -136,9 +136,16 @@
<%-- And only show theme option if custom themes are enabled --%>
<s:if test="getProp('themes.customtheme.allowed')">
- <s:url action="themeEdit" namespace="/roller-ui/authoring" id="weblogTheme">
- <s:param name="weblog" value="#perms.weblog.handle" />
- </s:url>
+ <s:if test="#perms.weblog.editorTheme == 'custom'">
+ <s:url action="templates" namespace="/roller-ui/authoring" id="weblogTheme">
+ <s:param name="weblog" value="#perms.weblog.handle" />
+ </s:url>
+ </s:if>
+ <s:else>
+ <s:url action="themeEdit" namespace="/roller-ui/authoring" id="weblogTheme">
+ <s:param name="weblog" value="#perms.weblog.handle" />
+ </s:url>
+ </s:else>
<img src='<s:url value="/roller-ui/images/layout.png"/>' />
<a href='<s:property value="weblogTheme" />'>
<s:text name="yourWebsites.theme" /></a>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp?rev=1621549&r1=1621548&r2=1621549&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp Sun Aug 31 01:01:37 2014
@@ -76,15 +76,6 @@
<%-- ================================================================== --%>
<%-- Save, Close and Resize text area buttons--%>
- <script>
- if (getCookie("templateEditorRows") != null) {
- document.getElementById('stylesheetEdit_contentsMobile').rows = getCookie("templateEditorRows");
- document.getElementById('stylesheetEdit_contentsStandard').rows = getCookie("templateEditorRows");
- } else {
- document.getElementById('stylesheetEdit_contentsMobile').rows = 20;
- document.getElementById('stylesheetEdit_contentsStandard').rows = 20;
- }
- </script>
<table style="width:100%">
<tr>
<td>
@@ -97,31 +88,11 @@
<s:submit value="%{getText('stylesheetEdit.delete')}" onclick="deleteStylesheet();return false;" />
</s:if>
</td>
- <td align="right">
- <!-- Add buttons to make this textarea taller or shorter -->
- <input type="button" name="taller" value=" ↓ " onclick="changeSize1(5)" />
- <input type="button" name="shorter" value=" ↑ " onclick="changeSize1(-5)" />
- </td>
</tr>
</table>
</s:form>
-<script>
-function changeSize1(num) {
- var standardElem = document.getElementById('stylesheetEdit_contentsStandard');
- var mobileElem = document.getElementById('stylesheetEdit_contentsMobile');
- a = standardElem.rows + num;
- if (a > 0) {
- standardElem.rows = a;
- mobileElem.rows = a;
- }
- var expires = new Date();
- expires.setTime(expires.getTime() + 24 * 90 * 60 * 60 * 1000); // sets it for approx 90 days.
- setCookie("templateEditorRows", standardElem.rows, expires);
-}
-</script>
-
<script src="<s:url value='/roller-ui/scripts/jquery-2.1.1.min.js'></s:url>"></script>
<script src="<s:url value='/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js'></s:url>"></script>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp?rev=1621549&r1=1621548&r2=1621549&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp Sun Aug 31 01:01:37 2014
@@ -119,17 +119,6 @@
<%-- ================================================================== --%>
<%-- Save, Close and Resize text area buttons--%>
- <script>
- if (getCookie("templateEditorRows") != null) {
- document.getElementById('template_bean_contentsMobile').rows = getCookie("templateEditorRows");
- document.getElementById('template_bean_contentsStandard').rows = getCookie("templateEditorRows");
- } else {
- document.getElementById('template_bean_contentsMobile').rows = 20;
- document.getElementById('template_bean_contentsStandard').rows = 20;
- }
-
- </script>
-
<table style="width:100%">
<tr>
<td>
@@ -137,11 +126,6 @@
<input type="button" value='<s:text name="generic.done"/>'
onclick="window.location='<s:url action="templates"><s:param name="weblog" value="%{weblog}"/></s:url>'" />
</td>
- <td align="right">
- <!-- Add buttons to make this textarea taller or shorter -->
- <input type="button" name="taller" value=" ↓ " onclick="changeSize1(5)" />
- <input type="button" name="shorter" value=" ↑ " onclick="changeSize1(-5)" />
- </td>
</tr>
</table>
@@ -271,18 +255,6 @@ function launchPage() {
window.open(weblogURL + 'page/' + originalLink+'?type='+type, '_blank');
}
}
-function changeSize1(num) {
- var standardElem = document.getElementById('template_bean_contentsStandard');
- var mobileElem = document.getElementById('template_bean_contentsMobile');
- a = standardElem.rows + num;
- if (a > 0) {
- standardElem.rows = a;
- mobileElem.rows = a;
- }
- var expires = new Date();
- expires.setTime(expires.getTime() + 24 * 90 * 60 * 60 * 1000); // sets it for approx 90 days.
- setCookie("templateEditorRows", standardElem.rows, expires);
-}
//Get cookie to determine state of control
if (getCookie('control_advancedControl') != null) {
if(getCookie('control_advancedControl') == 'true'){