Author: gmazza
Date: Sat Aug 2 15:00:55 2014
New Revision: 1615318
URL: http://svn.apache.org/r1615318
Log:
Removed 'copied templates to custom' message in cases where no template copying
is occurring.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java?rev=1615318&r1=1615317&r2=1615318&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
Sat Aug 2 15:00:55 2014
@@ -120,7 +120,7 @@ public class ThemeEdit extends UIAction
Weblog weblog = getActionWeblog();
- // we are dealing with a custom theme scenario
+ // Are we dealing with a custom theme scenario?
if (WeblogTheme.CUSTOM.equals(getThemeType())) {
// only continue if custom themes are allowed
@@ -160,7 +160,7 @@ public class ThemeEdit extends UIAction
CacheManager.invalidate(weblog);
addMessage("themeEditor.setTheme.success",
WeblogTheme.CUSTOM);
- if (t != null) {
+ if (isImportTheme() && t != null) {
addMessage("Successfully copied templates from
theme - "
+ t.getName());
}
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp?rev=1615318&r1=1615317&r2=1615318&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp Sat Aug
2 15:00:55 2014
@@ -19,7 +19,6 @@
<script src="<s:url value="/roller-ui/scripts/jquery-2.1.1.min.js"
/>"></script>
<script>
-<!--
function previewImage(q, theme) {
q.attr('src','<s:property value="siteURL"
/>/roller-ui/authoring/previewtheme?theme=' + theme);
var url = "<%= request.getContextPath() %>/roller-ui/authoring/themedata/";
@@ -51,7 +50,6 @@ function updateThemeChooser(selected) {
function toggleImportThemeDisplay() {
$('themeImport').toggle();
}
--->
</script>
<p class="subtitle">
