branch develop updated (dc7a27c -> 8f9251c)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository bow. See http://git.chorem.org/bow.git from dc7a27c add support for BowAuthentication on all Bookmark - add description in BowAuthentication - inverse link now: BowUser <- BowAuthentication -> BowBookmark via field target:Wikitty - register new extension in Proxy new 8f9251c add icon before script(let) link default password length to 15 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8f9251c26cd84cd1e364b7e1112e1f579329f48c Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Sun Aug 2 03:20:32 2015 +0200 add icon before script(let) link default password length to 15 Summary of changes: bow-ui/src/main/java/org/chorem/bow/BowSession.java | 1 + bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp | 19 +++++++++++-------- bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp | 4 ++-- bow-ui/src/main/webapp/css/bookmark.css | 2 +- bow-ui/src/main/webapp/css/global.css | 12 ++++++++++++ bow-ui/src/main/webapp/img/scriptlet.png | Bin 0 -> 998 bytes bow-ui/src/main/webapp/img/terminal.png | Bin 0 -> 946 bytes 7 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 bow-ui/src/main/webapp/img/scriptlet.png create mode 100644 bow-ui/src/main/webapp/img/terminal.png -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit 8f9251c26cd84cd1e364b7e1112e1f579329f48c Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Sun Aug 2 03:20:32 2015 +0200 add icon before script(let) link default password length to 15 --- bow-ui/src/main/java/org/chorem/bow/BowSession.java | 1 + bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp | 19 +++++++++++-------- bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp | 4 ++-- bow-ui/src/main/webapp/css/bookmark.css | 2 +- bow-ui/src/main/webapp/css/global.css | 12 ++++++++++++ bow-ui/src/main/webapp/img/scriptlet.png | Bin 0 -> 998 bytes bow-ui/src/main/webapp/img/terminal.png | Bin 0 -> 946 bytes 7 files changed, 27 insertions(+), 11 deletions(-) diff --git a/bow-ui/src/main/java/org/chorem/bow/BowSession.java b/bow-ui/src/main/java/org/chorem/bow/BowSession.java index 891873e..5b8d3c5 100644 --- a/bow-ui/src/main/java/org/chorem/bow/BowSession.java +++ b/bow-ui/src/main/java/org/chorem/bow/BowSession.java @@ -137,6 +137,7 @@ public class BowSession implements Serializable { BowUser user = getUser(); result = new BowAuthenticationImpl(); + result.setMaxLength(15); // default length of password result.setTarget(wikittyId); result.setOwner(user); result.setReader(Collections.singleton(user.getWikittyId())); diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp index b2b6803..a0dd242 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp @@ -56,12 +56,14 @@ </s:a> </s:if> </span> - <span class="left"> - <s:if test="#auth != null"> - <a href="${u:scriptletPassword(auth)}">BowPwd${bookmark.privateAlias}</a> - <a href="${u:scriptPassword(auth)}" download="BowPwd${bookmark.privateAlias}.sh">BowPwd${bookmark.privateAlias}.sh</a> - </s:if> - </span> + <s:if test="#auth != null"> + <span class="left"> + <a class="scriptlet" href="${u:scriptletPassword(auth)}">BowPwd${bookmark.privateAlias}</a> + </span> + <span class="left"> + <a class="script" href="${u:scriptPassword(auth)}" download="BowPwd${bookmark.privateAlias}.sh">BowPwd${bookmark.privateAlias}.sh</a> + </span> + </s:if> <span class="spacemax"></span> <span class="right"> <s:url var="screenshotBookmark" action="screenshotBookmark" escapeAmp="true"> @@ -127,7 +129,8 @@ <div class="markdown"> ${u:toHtml(bookmark.description)} </div> - <c:if test="#auth != null"> + <s:if test="#auth != null"> + <h3><s:text name="bow.bookmark.authentication" /> :</h3> <s:if test="!#auth.description.empty"> <div class="markdown"> ${u:toHtml(auth.description)} @@ -138,7 +141,7 @@ ${u:toHtml(auth.form)} </div> </s:if> - </c:if> + </s:if> <p class="tags"> <strong><s:text name="bow.bookmark.tags" /> :</strong> <s:iterator value="#bookmark.labels" var="tag"> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp index e2b69ba..a227e2b 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp @@ -119,8 +119,8 @@ <div class="formFrame fond"> <h3> <s:text name="bow.preferences.authentication"/> - <a href="${u:scriptletPassword(bowAuth)}">BowPwd</a> - <a href="${u:scriptPassword(bowAuth)}" download="BowPwd.sh">BowPwd.sh</a> + <a class="scriptlet" href="${u:scriptletPassword(bowAuth)}">BowPwd</a> + <a class="script" href="${u:scriptPassword(bowAuth)}" download="BowPwd.sh">BowPwd.sh</a> </h3> <br/> <s:form action="updateAuthenticationPref" cssClass="pretty-form" method="post"> diff --git a/bow-ui/src/main/webapp/css/bookmark.css b/bow-ui/src/main/webapp/css/bookmark.css index 1387cf8..cd3ebc8 100644 --- a/bow-ui/src/main/webapp/css/bookmark.css +++ b/bow-ui/src/main/webapp/css/bookmark.css @@ -123,7 +123,7 @@ } .bookmark .bookmarkhead .edit-authentication{ - background:url('../img/cadena.png') no-repeat; + background:url('../img/cadena.png') center no-repeat; width:31px; height:32px; position:absolute; diff --git a/bow-ui/src/main/webapp/css/global.css b/bow-ui/src/main/webapp/css/global.css index bf9f21b..c855e25 100644 --- a/bow-ui/src/main/webapp/css/global.css +++ b/bow-ui/src/main/webapp/css/global.css @@ -211,3 +211,15 @@ form.pretty-form input.submit-button { .public-true .group-name { background-color: darkgray; } + +a.scriptlet { + background:url('../img/scriptlet.png') center left no-repeat; + padding-left: 24px; + padding-right: 3px; +} + +a.script { + background:url('../img/terminal.png') center left no-repeat; + padding-left: 24px; + padding-right: 3px; +} \ No newline at end of file diff --git a/bow-ui/src/main/webapp/img/scriptlet.png b/bow-ui/src/main/webapp/img/scriptlet.png new file mode 100644 index 0000000..7ae0cc9 Binary files /dev/null and b/bow-ui/src/main/webapp/img/scriptlet.png differ diff --git a/bow-ui/src/main/webapp/img/terminal.png b/bow-ui/src/main/webapp/img/terminal.png new file mode 100644 index 0000000..fcc8aea Binary files /dev/null and b/bow-ui/src/main/webapp/img/terminal.png differ -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm