Author: ilgrosso
Date: Tue Jan 29 09:40:08 2013
New Revision: 1439799
URL: http://svn.apache.org/viewvc?rev=1439799&view=rev
Log:
[SYNCOPE-293] Removing unwanted pom properties + fixing positioning issues
under Firefox
Modified:
syncope/trunk/console/pom.xml
syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java
syncope/trunk/console/src/main/resources/applicationContext.xml
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/WelcomePage.html
syncope/trunk/console/src/main/webapp/img/info.png
syncope/trunk/pom.xml
Modified: syncope/trunk/console/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/pom.xml?rev=1439799&r1=1439798&r2=1439799&view=diff
==============================================================================
--- syncope/trunk/console/pom.xml (original)
+++ syncope/trunk/console/pom.xml Tue Jan 29 09:40:08 2013
@@ -197,6 +197,7 @@ under the License.
<configuration>
<source>
project.properties['urlencoded.csvdir.path'] =
java.net.URLEncoder.encode(project.properties['test.csvdir.path'])
+ project.properties['licenseUrl'] =
project.parent.licenses[0].url
</source>
</configuration>
</execution>
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java?rev=1439799&r1=1439798&r2=1439799&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java
Tue Jan 29 09:40:08 2013
@@ -88,11 +88,11 @@ public class SyncopeApplication extends
public void setupNavigationPanel(final WebPage page, final XMLRolesReader
xmlRolesReader, final boolean notsel,
final String version) {
- final ModalWindow modal;
- page.add(modal = new ModalWindow("modal"));
- modal.setInitialWidth(580);
- modal.setInitialHeight(285);
- modal.setPageCreator(new ModalWindow.PageCreator() {
+ final ModalWindow infoModal = new ModalWindow("infoModal");
+ page.add(infoModal);
+ infoModal.setInitialWidth(580);
+ infoModal.setInitialHeight(285);
+ infoModal.setPageCreator(new ModalWindow.PageCreator() {
private static final long serialVersionUID = -7834632442532690940L;
@@ -102,20 +102,16 @@ public class SyncopeApplication extends
}
});
- final AjaxLink versionLink = new IndicatingAjaxLink("versionLink") {
+ final AjaxLink infoLink = new AjaxLink("infoLink") {
private static final long serialVersionUID = -7978723352517770644L;
@Override
public void onClick(AjaxRequestTarget target) {
-
- modal.show(target);
+ infoModal.show(target);
}
};
-
- MetaDataRoleAuthorizationStrategy.authorize(versionLink,
Component.ENABLE, xmlRolesReader.getAllAllowedRoles(
- "Configuration", "read"));
- page.add(versionLink);
+ page.add(infoLink);
BookmarkablePageLink schemaLink = new BookmarkablePageLink("schema",
Schema.class);
MetaDataRoleAuthorizationStrategy.authorizeAll(schemaLink,
WebPage.ENABLE);
Modified: syncope/trunk/console/src/main/resources/applicationContext.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/applicationContext.xml?rev=1439799&r1=1439798&r2=1439799&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/applicationContext.xml (original)
+++ syncope/trunk/console/src/main/resources/applicationContext.xml Tue Jan 29
09:40:08 2013
@@ -60,7 +60,7 @@ under the License.
</bean>
<bean id="site" class="java.lang.String">
- <constructor-arg value="${syncopeUrl}"/>
+ <constructor-arg value="${project.parent.url}"/>
</bean>
<bean id="license" class="java.lang.String">
Modified:
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html?rev=1439799&r1=1439798&r2=1439799&view=diff
==============================================================================
---
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html
(original)
+++
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html
Tue Jan 29 09:40:08 2013
@@ -121,8 +121,8 @@ under the License.
</li>
<li style="float:right;width:auto;text-align:right;">
<a href="#" wicket:id="logout"><img src="img/menu/logout.png"
alt="Logout" width="80" height="80" /><br /></a>
- <div>
- <span id="username" wicket:id="username" style="padding-right:
18px;cursor: pointer;"/>
+ <div style="display: table-row;">
+ <div id="username" wicket:id="username" style="padding-right:
5px;width: 100px;cursor: pointer;display: table-cell;"/>
<span wicket:id="editProfile"/>
<wicket:fragment wicket:id="adminEmptyFrag"/>
@@ -131,15 +131,12 @@ under the License.
<span id="editProfile" wicket:id="editProfile"
style="cursor: pointer;background-color:
#446633;padding-left: 9px;padding-right: 9px;"/>
</wicket:fragment>
- <div style="margin-top: -13px;">
- <div wicket:id="modal"/>
- <a wicket:id="versionLink"><img src="img/info.png" alt="info"
width="4%"/></a>
+ <div>
+ <div wicket:id="infoModal"/>
+ <a wicket:id="infoLink" style="vertical-align: middle;"><img
src="img/info.png" alt="info" style="padding-right: 10px;"/></a>
</div>
</div>
</li>
- <!-- <li style="position: absolute; left: -33px; top: 84px;">
-
- </li>-->
</ul>
<div wicket:id="editProfileModal" ></div>
</div>
Modified:
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/WelcomePage.html
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/WelcomePage.html?rev=1439799&r1=1439798&r2=1439799&view=diff
==============================================================================
---
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/WelcomePage.html
(original)
+++
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/WelcomePage.html
Tue Jan 29 09:40:08 2013
@@ -39,8 +39,8 @@ under the License.
<body style="text-align:center">
<div id="splash">
<img src="img/logo.png" alt="syncope" title="syncope" id="logo" />
- <div wicket:id="modal"/>
- <a style="position: relative; top: 20px; left: -103px;"
wicket:id="versionLink"><img src="img/info.png" alt="info" title="info"
width="3%"/></a>
+ <div wicket:id="infoModal"/>
+ <a style="position: relative; top: 20px; left: -103px;"
wicket:id="infoLink"><img src="img/info.png" alt="info" title="info"/></a>
<ul>
<li><a href="#" wicket:id="todo" class="todo"><img
wicket:id="todoIcon" alt="TODO" width="80" height="80" /><br /><wicket:message
key="todo"/></a></li>
<li><a href="#" wicket:id="schema" class="schema"><img
wicket:id="schemaIcon" alt="Schema" width="80" height="80" /><br
/><wicket:message key="schema"/></a></li>
Modified: syncope/trunk/console/src/main/webapp/img/info.png
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/webapp/img/info.png?rev=1439799&r1=1439798&r2=1439799&view=diff
==============================================================================
Binary files - no diff available.
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1439799&r1=1439798&r2=1439799&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Tue Jan 29 09:40:08 2013
@@ -345,9 +345,6 @@ under the License.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <syncopeUrl>http://syncope.apache.org</syncopeUrl>
- <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0.txt</licenseUrl>
-
<!-- static secret key, only used for build: generated overlays will
override this during archetype:generate -->
<secretKey>1abcdefghilmnopqrstuvz2!</secretKey>
</properties>
