Skip to content

Max Mecklin / Moya

Go to a project
Commit 25cc7ecc by Petri Järvisalo
Options

I changed settings to point to default workspaces jdk, it was mainly for mac. 

minor modification to css styles:
 - tabnav.css is moved and will be loaded separately for templates.
1 parent 6ebf064c
Inline Side-by-side
Showing with 268 additions and 47 deletions
code/LanBortalAuthModule/.classpath
......@@ -4,10 +4,6 @@
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/LanBortalAuthModuleClient"/>
<classpathentry combineaccessrules="false" kind="src" path="/lib-AuthModule-depends"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.2"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
code/LanBortalBeansClient/.classpath
......@@ -10,10 +10,6 @@
<attribute name="owner.project.facets" value="jst.utility"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
code/LanBortalDatabase/.classpath
......@@ -8,10 +8,6 @@
<attribute name="owner.project.facets" value="jst.utility"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
code/LanBortalUtilities/.classpath
......@@ -7,10 +7,6 @@
<attribute name="owner.project.facets" value="jst.utility"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
code/LanBortalWeb/.classpath
......@@ -8,11 +8,7 @@
<attribute name="owner.project.facets" value="jst.web"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/lib-AuthModule-depends"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
code/LanBortalWeb/.settings/org.eclipse.jdt.core.prefs
#Sun Mar 27 01:20:35 EET 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
code/LanBortalWeb/.settings/org.hibernate.eclipse.console.prefs 0 → 100644
default.configuration=
eclipse.preferences.version=1
hibernate3.enabled=false
code/LanBortalWeb/WebContent/place/adminGroups.xhtml
......@@ -12,31 +12,15 @@
<f:viewParam name="userid" value="#{userView.userid}" />
<f:event type="preRenderView" listener="#{userView.initView}" />
</f:metadata>
<ui:define name="title">
<h1>#{i18n['placegroupview.header']}</h1>
<users:usertabs tabId="groups" />
</ui:define>
<ui:define name="content">
<h2>#{i18n['placetoken.pageHeader']}</h2>
<p>#{i18n['placetoken.topText']}</p>
<h:form id="placeTokenForm">
<h:panelGrid columns="2">
<h:outputLabel value="#{i18n['placetoken.token']}:" />
<h:inputText value="#{tokenView.token}" />
<h:commandButton id="commitbtn" action="#{tokenView.saveToken()}" value="#{i18n['placetoken.commit']}" />
</h:panelGrid>
</h:form>
<h2>#{i18n['placetoken.placelist']}</h2>
<p>#{i18n['placegroupview.toptext']}</p>
<h:outputText rendered="#{empty placeGroupView.groupMemberships}" value="#{i18n['placegroupview.noMemberships']}" />
<h:form rendered="#{!empty placeGroupView.groupMemberships}" id="placelistform">
<p>
<a href="#{request.contextPath}/PlaceGroupPdf">#{i18n['placegroup.printPdf']}</a>
</p>
<h:dataTable value="#{placeGroupView.groupMemberships}" var="member">
<h:column>
......@@ -73,6 +57,20 @@
</h:dataTable>
</h:form>
<p>
<input type="button" onclick="location.replace('#{request.contextPath}/PlaceGroupPdf');" value="#{i18n['placegroup.printPdf']}" />
</p>
<h2>#{i18n['placetoken.pageHeader']}</h2>
<p>#{i18n['placetoken.topText']}</p>
<h:form id="placeTokenForm">
<h:outputLabel value="#{i18n['placetoken.token']}:" />
<h:inputText value="#{tokenView.token}" />
<h:commandButton id="commitbtn" action="#{tokenView.saveToken()}" value="#{i18n['placetoken.commit']}" />
</h:form>
</ui:define>
</ui:composition>
......
code/LanBortalWeb/WebContent/resources/cditools/user/usertabs.xhtml
......@@ -8,7 +8,8 @@
</composite:interface>
<composite:implementation>
<h:outputStylesheet library="style" name="tabnav.css" />
<h:outputStylesheet library="style/#{sessionHandler.getLayout()}/css" name="tabnav.css" />
<div class="userstatus" style="float: right; margin-right: 10px; color: #7DAC0C; font-size: 16px;">
<h:outputText value="#{i18n['user.cardPower']}: #{userView.usersCardtemplate.name}" />
</div>
......@@ -17,9 +18,7 @@
<h:outputText value="#{i18n['usertitle.managingUser']}: #{userView.user.nick} / #{userView.user.wholeName} " />
</h2>
</ui:fragment>
<div id="#{cc.attrs.tabId}">
<ul id="usertabnav">
<li class="edit"><h:link outcome="/useradmin/edit" value="#{i18n['user.edit']}">
......
code/LanBortalWeb/WebContent/resources/style/insomnia1/css/tabnav.css 0 → 100644
/* begin css tabs */
ul#usertabnav { /* general settings */
text-align: left; /* set to left, right or center */
margin: 1em 0 1em 0; /* set margins as desired */
font: bold 11px verdana, arial, sans-serif; /* set font as desired */
border-bottom: 1px solid #7DAC0C; /* set border COLOR as desired */
list-style-type: none;
padding: 3px 10px 4px 10px; /* THIRD number must change with respect to padding-top (X) below */
}
ul#usertabnav li { /* do not change */
display: inline;
}
div#edit li.edit,
div#chpass li.chpass,
div#accountevents li.accountevents,
div#groups li.groups,
div#token li.token,
div#picture li.picture
{ /* settings for selected tab */
border-bottom: 1px solid #fff; /* set border color to page background color */
background-color: #fff; /* set background color to match above border color */
}
div#edit li.edit a,
div#chpass li.chpass a,
div#accountevents li.accountevents a,
div#groups li.groups a,
div#token li.token a,
div#picture li.picture a{ /* settings for selected tab link */
background-color: #FFF; /* set selected tab background color as desired */
color: #000; /* set selected tab link color as desired */
position: relative;
top: 1px;
padding-top: 4px; /* must change with respect to padding (X) above and below */
}
ul#usertabnav li a { /* settings for all tab links */
padding: 4px 5px; /* set padding (tab size) as desired; FIRST number must change with respect to padding-top (X) above */
border: 1px solid #7DAC0C; /* set border COLOR as desired; usually matches border color specified in #usertabnav */
background-color: #37bce6; /* set unselected tab background color as desired */
color: #0f3541; /* set unselected tab link color as desired */
margin-right: 0px; /* set additional spacing between tabs as desired */
text-decoration: none;
border-bottom: none;
border-top-right-radius: 7px;
border-top-left-radius: 7px;
}
ul#usertabnav a:hover { /* settings for hover effect */
background: #b8f7ff; /* set desired hover color */
}
/* end css tabs */
\ No newline at end of file
code/LanBortalWeb/WebContent/resources/style/insomnia2/css/tabnav.css 0 → 100644
/* begin css tabs */
ul#usertabnav { /* general settings */
text-align: left; /* set to left, right or center */
margin: 1em 0 1em 0; /* set margins as desired */
font: bold 11px verdana, arial, sans-serif; /* set font as desired */
border-bottom: 1px solid #7DAC0C; /* set border COLOR as desired */
list-style-type: none;
padding: 3px 10px 4px 10px; /* THIRD number must change with respect to padding-top (X) below */
}
ul#usertabnav li { /* do not change */
display: inline;
}
div#edit li.edit,
div#chpass li.chpass,
div#accountevents li.accountevents,
div#groups li.groups,
div#token li.token,
div#picture li.picture
{ /* settings for selected tab */
border-bottom: 1px solid #fff; /* set border color to page background color */
background-color: #fff; /* set background color to match above border color */
}
div#edit li.edit a,
div#chpass li.chpass a,
div#accountevents li.accountevents a,
div#groups li.groups a,
div#token li.token a,
div#picture li.picture a{ /* settings for selected tab link */
background-color: #FFF; /* set selected tab background color as desired */
color: #000; /* set selected tab link color as desired */
position: relative;
top: 1px;
padding-top: 4px; /* must change with respect to padding (X) above and below */
}
ul#usertabnav li a { /* settings for all tab links */
padding: 4px 5px; /* set padding (tab size) as desired; FIRST number must change with respect to padding-top (X) above */
border: 1px solid #7DAC0C; /* set border COLOR as desired; usually matches border color specified in #usertabnav */
background-color: #37bce6; /* set unselected tab background color as desired */
color: #0f3541; /* set unselected tab link color as desired */
margin-right: 0px; /* set additional spacing between tabs as desired */
text-decoration: none;
border-bottom: none;
border-top-right-radius: 7px;
border-top-left-radius: 7px;
}
ul#usertabnav a:hover { /* settings for hover effect */
background: #b8f7ff; /* set desired hover color */
}
/* end css tabs */
\ No newline at end of file
code/LanBortalWeb/WebContent/resources/style/stream10/css/tabnav.css 0 → 100644
/* begin css tabs */
ul#usertabnav { /* general settings */
text-align: left; /* set to left, right or center */
margin: 1em 0 1em 0; /* set margins as desired */
font: bold 11px verdana, arial, sans-serif; /* set font as desired */
border-bottom: 1px solid #7DAC0C; /* set border COLOR as desired */
list-style-type: none;
padding: 3px 10px 4px 10px; /* THIRD number must change with respect to padding-top (X) below */
}
ul#usertabnav li { /* do not change */
display: inline;
}
div#edit li.edit,
div#chpass li.chpass,
div#accountevents li.accountevents,
div#groups li.groups,
div#token li.token,
div#picture li.picture
{ /* settings for selected tab */
border-bottom: 1px solid #fff; /* set border color to page background color */
background-color: #fff; /* set background color to match above border color */
}
div#edit li.edit a,
div#chpass li.chpass a,
div#accountevents li.accountevents a,
div#groups li.groups a,
div#token li.token a,
div#picture li.picture a{ /* settings for selected tab link */
background-color: #FFF; /* set selected tab background color as desired */
color: #000; /* set selected tab link color as desired */
position: relative;
top: 1px;
padding-top: 4px; /* must change with respect to padding (X) above and below */
}
ul#usertabnav li a { /* settings for all tab links */
padding: 4px 5px; /* set padding (tab size) as desired; FIRST number must change with respect to padding-top (X) above */
border: 1px solid #7DAC0C; /* set border COLOR as desired; usually matches border color specified in #usertabnav */
background-color: #37bce6; /* set unselected tab background color as desired */
color: #0f3541; /* set unselected tab link color as desired */
margin-right: 0px; /* set additional spacing between tabs as desired */
text-decoration: none;
border-bottom: none;
border-top-right-radius: 7px;
border-top-left-radius: 7px;
}
ul#usertabnav a:hover { /* settings for hover effect */
background: #b8f7ff; /* set desired hover color */
}
/* end css tabs */
\ No newline at end of file
code/LanBortalWeb/WebContent/resources/style/template1/css/tabnav.css 0 → 100644
#edit { float: left; width:100%; border-bottom: 1px solid black; }
ul#usertabnav { float:left; width: 100%; border:1px solid rgba(200,200,200,0); background:rgba(200,200,200,0); border-radius: 16px 16px 0 0; }
ul#usertabnav li {display:inline; list-style:none; }
ul#usertabnav li a {display:block; line-height: 1.7em; float:left; padding:2px 5px 2px 5px; color:rgb(125,125,125); text-decoration:none; font-size:120%; background-color:rgba(100,100,100,0.3); color: rgba(0,0,0,1); border-radius: 12px 12px 0 0; border: 1px solid rgba(0,0,0,0.1); border-bottom: none;}
ul#usertabnava:hover {text-decoration:none; color:rgb(50,50,50);}
ul#usertabnav li .active {font-weight: bold; background-color:rgba(250,250,250,0.4); color: rgba(0,0,0,1); border-radius: 12px 12px 0 0; border: 1px solid black; border-bottom: none }
#edit {
clear: both;
}
\ No newline at end of file
code/LanBortalWeb/WebContent/resources/style/tone/css/tabnav.css 0 → 100644
/* begin css tabs */
ul#usertabnav { /* general settings */
text-align: left; /* set to left, right or center */
margin: 1em 0 1em 0; /* set margins as desired */
font: bold 11px verdana, arial, sans-serif; /* set font as desired */
border-bottom: 1px solid #7DAC0C; /* set border COLOR as desired */
list-style-type: none;
padding: 3px 10px 4px 10px; /* THIRD number must change with respect to padding-top (X) below */
}
ul#usertabnav li { /* do not change */
display: inline;
}
div#edit li.edit,
div#chpass li.chpass,
div#accountevents li.accountevents,
div#groups li.groups,
div#token li.token,
div#picture li.picture
{ /* settings for selected tab */
border-bottom: 1px solid #fff; /* set border color to page background color */
background-color: #fff; /* set background color to match above border color */
}
div#edit li.edit a,
div#chpass li.chpass a,
div#accountevents li.accountevents a,
div#groups li.groups a,
div#token li.token a,
div#picture li.picture a{ /* settings for selected tab link */
background-color: #FFF; /* set selected tab background color as desired */
color: #000; /* set selected tab link color as desired */
position: relative;
top: 1px;
padding-top: 4px; /* must change with respect to padding (X) above and below */
}
ul#usertabnav li a { /* settings for all tab links */
padding: 4px 5px; /* set padding (tab size) as desired; FIRST number must change with respect to padding-top (X) above */
border: 1px solid #7DAC0C; /* set border COLOR as desired; usually matches border color specified in #usertabnav */
background-color: #37bce6; /* set unselected tab background color as desired */
color: #0f3541; /* set unselected tab link color as desired */
margin-right: 0px; /* set additional spacing between tabs as desired */
text-decoration: none;
border-bottom: none;
border-top-right-radius: 7px;
border-top-left-radius: 7px;
}
ul#usertabnav a:hover { /* settings for hover effect */
background: #b8f7ff; /* set desired hover color */
}
/* end css tabs */
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!