roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [16/16] roller git commit: Merge branch 'master' into bootstrap-ui
Date Sat, 28 Jan 2017 22:22:50 GMT
Merge branch 'master' into bootstrap-ui

Conflicts:
	app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp


Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/2da0e390
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/2da0e390
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/2da0e390

Branch: refs/heads/bootstrap-ui
Commit: 2da0e39089fb92d0e1f95651ea07739d62bf259b
Parents: 29adfd3 96e845a
Author: Dave Johnson <snoopdave@gmail.com>
Authored: Sat Jan 28 17:22:30 2017 -0500
Committer: Dave Johnson <snoopdave@gmail.com>
Committed: Sat Jan 28 17:22:30 2017 -0500

----------------------------------------------------------------------
 app/pom.xml                                     | 39 ++++++++++++++-
 .../business/jpa/JPAThreadManagerImpl.java      | 11 +++--
 .../business/jpa/JPAUserManagerImpl.java        |  3 +-
 .../business/jpa/JPAWeblogEntryManagerImpl.java |  2 +-
 .../apache/roller/weblogger/util/MailUtil.java  | 51 ++++++++++----------
 .../ApplicationResources_de.properties          |  2 +-
 .../ApplicationResources_es.properties          |  2 +-
 .../ApplicationResources_fr.properties          |  2 +-
 .../ApplicationResources_ja.properties          |  6 +--
 .../ApplicationResources_ko.properties          |  2 +-
 .../ApplicationResources_ru.properties          |  2 +-
 .../ApplicationResources_zh_CN.properties       |  2 +-
 .../roller/weblogger/pojos/TaskLock.orm.xml     |  2 +-
 .../main/resources/sql/510-to-520-migration.vm  | 12 ++---
 app/src/main/resources/sql/db2.properties       |  4 +-
 app/src/main/resources/sql/hsqldb.properties    |  4 +-
 app/src/main/resources/sql/macros.vm            |  4 ++
 app/src/main/resources/sql/mssql.properties     |  4 +-
 .../webapp/WEB-INF/jsps/core/CreateWeblog.jsp   |  2 +-
 .../webapp/WEB-INF/jsps/editor/ThemeEdit.jsp    |  4 +-
 app/src/main/webapp/WEB-INF/web.xml             | 11 +++++
 .../weblogger/util/LinkbackExtractorTest.java   |  2 +-
 22 files changed, 114 insertions(+), 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/roller/blob/2da0e390/app/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/roller/blob/2da0e390/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
----------------------------------------------------------------------
diff --cc app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
index 2be53cb,e233946..14a3215
--- a/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
@@@ -17,70 -17,96 +17,70 @@@
  --%>
  <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
  <script src="<s:url value="/roller-ui/scripts/jquery-2.1.1.min.js" />"></script>
- <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.23/angular.min.js"></script>
+ <script src="<s:url value='/webjars/angular/1.2.29/angular.min.js' />"></script>
  
 -<script>
 -function handlePreview(handle) {
 -    previewSpan = document.getElementById("handlePreview");
 -    var n1 = previewSpan.childNodes[0];
 -    var n2 = document.createTextNode(handle.value);
 -    if (handle.value == null) {
 -	    previewSpan.appendChild(n2);
 -    } else {
 -	    previewSpan.replaceChild(n2, n1);
 -    }
 -}
 -</script>
  
 -<p class="subtitle"><s:text name="createWebsite.prompt" /></p>
 +<p class="subtitle"><s:text name="createWebsite.prompt"/></p>
  
 -<br />
 +<br/>
  
 -<s:form action="createWeblog!save">
 -<s:hidden name="salt" />
 +<s:form action="createWeblog!save" theme="bootstrap" cssClass="form-horizontal">
  
 -<table class="formtable">
 +    <s:hidden name="salt"/>
  
 -<tr>
 -    <td class="label"><label for="name" /><s:text name="generic.name" /></label></td>
 -    <td class="field"><s:textfield name="bean.name" size="30" maxlength="30" /></td>
 -    <td class="description"><s:text name="createWebsite.tip.name" /></td>
 -</tr>
 +    <s:textfield label="%{getText('generic.name')}"
 +                 tooltip="%{getText('createWebsite.tip.name')}" onkeyup="formChanged()"
 +                 name="bean.name" size="30" maxlength="30"/>
  
 -<tr>
 -        <td class="label"><label for="description" /><s:text name="generic.tagline"
/></td>
 -    <td class="field"><s:textfield name="bean.description" size="40" maxlength="255"
/></td>
 -    <td class="description"><s:text name="createWebsite.tip.description" /></td>
 -</tr>
 +    <s:textfield label="%{getText('createWebsite.handle')}"
 +                 tooltip="%{getText('createWebsite.tip.handle')}"
 +                 name="bean.handle" size="30" maxlength="30"
 +                 onkeyup="handlePreview(this)"/>
  
 -<tr>
 -    <td class="label"><label for="handle" /><s:text name="createWebsite.handle"
/></label></td>
 -    <td class="field">
 -        <s:textfield name="bean.handle" size="30" maxlength="30" onkeyup="handlePreview(this)"
/><br />
 -        <span style="text-size:70%">
 +    <div class="form-group">
 +        <label class="col-sm-3"></label>
 +        <div class="col-sm-9 controls">
              <s:text name="createWebsite.weblogUrl" />:&nbsp;
 -            <s:property value="absoluteSiteURL" />/<span id="handlePreview" style="color:red"><s:if
test="bean.handle != null"><s:property value="bean.handle"/></s:if><s:else>handle</s:else></span>
 -        </span>
 -    </td>
 -    <td class="description"><s:text name="createWebsite.tip.handle" /></td>
 -</tr>
 -
 -<tr>
 -    <td class="label"><label for="emailAddress" /><s:text name="createWebsite.emailAddress"
/></label></td>
 -    <td class="field"><s:textfield name="bean.emailAddress" size="40" maxlength="50"
/></td>
 -    <td class="description"><s:text name="createWebsite.tip.email" /></td>
 -</tr>
 -
 -<tr>
 -    <td class="label"><label for="locale" /><s:text name="createWebsite.locale"
/></label></td>
 -    <td class="field">
 -       <s:select name="bean.locale" size="1" list="localesList" listValue="displayName"
/>
 -    </td>
 -    <td class="description"><s:text name="createWebsite.tip.locale" /></td>
 -</tr>
 -
 -<tr>
 -    <td class="label"><label for="timeZone" /><s:text name="createWebsite.timeZone"
/></label></td>
 -    <td class="field">
 -       <s:select name="bean.timeZone" size="1" list="timeZonesList" />
 -    </td>
 -    <td class="description"><s:text name="createWebsite.tip.timezone" /></td>
 -</tr>
 -
 -<tr>
 -    <td class="label"><label for="theme" /><s:text name="createWebsite.theme"
/></label></td>
 -    <td class="field" ng-app="themeSelectModule" ng-controller="themeController">
 -        <select id="themeSelector" name="bean.theme" size="1"
 -        ng-model="selectedTheme" ng-options="theme as theme.name for theme in themes track
by theme.id"></select>
 -        <br />
 -        <br />
 -        <p>{{ selectedTheme.description }}</p>
 -        <br />
 -        <img ng-src="<s:property value='siteURL'/>{{ selectedTheme.previewPath
}}"/>
 -    </td>
 -    <td class="description"><s:text name="createWebsite.tip.theme" /></td>
 -</tr>
 -
 -</table>
 -
 -<br />
 -
 -<s:submit value="%{getText('createWebsite.button.save')}" />
 -<input type="button" value="<s:text name="generic.cancel"/>" onclick="window.location='<s:url
action="menu"/>'" />
 +            <s:property value="absoluteSiteURL" />/<span id="handlePreview" style="color:red">
 +            <s:if test="bean.handle != null">
 +                <s:property value="bean.handle"/>
 +            </s:if>
 +            <s:else>handle</s:else></span>
 +            <br>
 +        </div>
 +    </div>
 +
 +    <s:textfield label="%{getText('createWebsite.emailAddress')}"
 +                 tooltip="%{getText('createWebsite.tip.emailAddress')}" onkeyup="formChanged()"
 +                 name="bean.emailAddress" size="40" maxlength="50"/>
 +
 +    <s:select label="%{getText('createWebsite.locale')}"
 +              tooltip="%{getText('createWebsite.tip.locale')}"
 +              name="bean.locale" size="1" list="localesList" listValue="displayName"/>
 +
 +    <s:select label="%{getText('createWebsite.timeZone')}"
 +              tooltip="%{getText('createWebsite.tip.timeZone')}"
 +              name="bean.timeZone" size="1" list="timeZonesList"/>
 +
 +    <div class="form-group" ng-app="themeSelectModule" ng-controller="themeController">
 +        <label class="col-sm-3 control-label" for="createWeblog_bean_timeZone">Timezone</label>
 +        <div class="col-sm-9 controls">
 +            <select id="themeSelector" name="bean.theme" size="1"
 +                    ng-model="selectedTheme"
 +                    ng-options="theme as theme.name for theme in themes track by theme.id">
 +            </select>
 +            <br>
 +            <br>
 +            <p>{{ selectedTheme.description }}</p>
 +            <img src="<s:property value='siteURL'/>{{ selectedTheme.previewPath
}}"/>
 +        </div>
 +    </div>
 +
 +    <s:submit cssClass="btn btn-default"
 +              value="%{getText('createWebsite.button.save')}"/>
 +
 +    <input class="btn" type="button" value="<s:text name="generic.cancel"/>"
 +           onclick="window.location='<s:url action="menu"/>'"/>
  
  </s:form>
  

http://git-wip-us.apache.org/repos/asf/roller/blob/2da0e390/app/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------


Mime
View raw message