Merge pull request #82 from mbien/table_upgrade
Roller 6.1 db table upgrade logic + maven dependency upgrades
diff --git a/app/src/main/resources/ApplicationResources.properties b/app/src/main/resources/ApplicationResources.properties
index fd5b18d..ae4932e 100644
--- a/app/src/main/resources/ApplicationResources.properties
+++ b/app/src/main/resources/ApplicationResources.properties
@@ -643,6 +643,7 @@
but the tables need to be upgraded.
installer.upgradeTables=Would you like Roller to upgrade the tables for you?
installer.yesUpgradeTables=Yes - upgrade tables now
+installer.finishUpgrade=Start Roller
installer.tablesUpgraded=Tables were upgraded successfully
installer.tablesUpgradedExplanation=\
Database tables were upgraded successfully as you can see below.
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp b/app/src/main/webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp
index 5c8e162..945e91d 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp
@@ -59,4 +59,9 @@
<s:iterator value="messages"><s:property/><br/></s:iterator>
</pre>
+ <s:form action="install!bootstrap" class="form-horizontal">
+ <s:hidden name="salt"/>
+ <s:submit value="%{getText('installer.finishUpgrade')}" cssClass="btn btn-primary" />
+ </s:form>
+
</s:else>
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
index dfa799e..326f9d5 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
@@ -383,7 +383,7 @@
});
function fullPreviewMode() {
- window.open('<s:property value="previewURL" />');
+ window.open('<s:property value="previewURL" />', 'roller-preview');
}
$(function () {
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp
index 9b96719..ee56faf 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp
@@ -57,7 +57,7 @@
<s:param name="bean.id" value="#post.id" />
</s:url>
<span class="glyphicon glyphicon-lock" aria-hidden="true"> </span>
- <s:a href="%{editUrl}"><str:truncateNicely lower="60">
+ <s:a href="%{editUrl}"><str:truncateNicely lower="40">
<s:property value="#post.title" /></str:truncateNicely></s:a>
</span><br />
</s:iterator>
@@ -78,7 +78,7 @@
<s:param name="bean.id" value="#post.id" />
</s:url>
<span class="glyphicon glyphicon-edit" aria-hidden="true"> </span>
- <s:a href="%{editUrl}"><str:truncateNicely lower="60">
+ <s:a href="%{editUrl}"><str:truncateNicely lower="40">
<s:property value="#post.title" /></str:truncateNicely></s:a>
</span><br />
</s:iterator>
@@ -102,7 +102,7 @@
<s:param name="bean.id" value="#post.id" />
</s:url>
<span class="glyphicon glyphicon-book" aria-hidden="true"> </span>
- <s:a href="%{editUrl}"><str:truncateNicely lower="60">
+ <s:a href="%{editUrl}"><str:truncateNicely lower="40">
<s:property value="#post.title" /></str:truncateNicely></s:a>
</span><br />
</s:iterator>
@@ -124,7 +124,7 @@
<s:param name="bean.id" value="#post.id" />
</s:url>
<span class="glyphicon glyphicon-time" aria-hidden="true"> </span>
- <s:a href="%{editUrl}"><str:truncateNicely lower="60">
+ <s:a href="%{editUrl}"><str:truncateNicely lower="40">
<s:property value="#post.title" /></str:truncateNicely></s:a>
</span><br />
</s:iterator>
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
index 9c775aa..dd9d09c 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
@@ -72,7 +72,7 @@
<div class="controls col-sm-9">
- <input type="text" id="clip_text" size="80"
+ <input type="text" id="clip_text" size="57"
value='<s:property value="bean.permalink" />' readonly />
<s:url var="linkIconURL" value="/roller-ui/images/clippy.svg"/>
diff --git a/app/src/main/webapp/WEB-INF/web.xml b/app/src/main/webapp/WEB-INF/web.xml
index 27229df..295dfaa 100644
--- a/app/src/main/webapp/WEB-INF/web.xml
+++ b/app/src/main/webapp/WEB-INF/web.xml
@@ -491,6 +491,8 @@
<jsp-property-group>
<url-pattern>*.jsp</url-pattern>
<page-encoding>UTF-8</page-encoding>
+ <!-- removes whitespace caused by jsp tags -->
+ <trim-directive-whitespaces>true</trim-directive-whitespaces>
</jsp-property-group>
</jsp-config>
