DMC/scipro
7
0
Fork 0
Code Issues43 Pull Requests9 Actions Projects1 Releases Wiki Activity

Merge branch 'cmslink' into develop

Browse Source
This commit is contained in:
anto-gom 2012-02-17 03:41:22 +01:00
commit b1bb91f87f
3 changed files with 20 additions and 15 deletions
src/main
java/se/su/dsv/scipro
basepanels
HeaderPanel.html
components
AbstractMenuPanel.html
webapp/css
scipro.css

8
src/main/java/se/su/dsv/scipro/basepanels/HeaderPanel.html

@ -11,7 +11,13 @@
</div>
<div class="prepend-2 span-15 last user-links"
wicket:id="userLinksPanel"></div>
<div wicket:id="mainMenuPanel" class="main-menu prepend-6"></div>
<div class="main-menu blue-tab-menu">
<a href="https://scipro.dsv.su.se/">Start</a>
</div>
<div class="main-menu prepend-6" wicket:id="mainMenuPanel">
</div>
<div wicket:id="serviceMenuPanel" class="service-menu"></div>
</header>
</wicket:panel>

17
src/main/java/se/su/dsv/scipro/components/AbstractMenuPanel.html

@ -5,15 +5,14 @@
>
<body>
<wicket:panel>
<div wicket:id="menuContainer">
<ul>
<li wicket:id="menuList">
<a href=# wicket:id="menuItem">
<img wicket:id="linkImage" /> <span wicket:id="linkText">[TabText]</span>
</a>
</li>
</ul>
</div>
<ul wicket:id="menuContainer">
<li wicket:id="menuList">
<a href=# wicket:id="menuItem">
<img wicket:id="linkImage" />
<span wicket:id="linkText">[TabText]</span>
</a>
</li>
</ul>
</wicket:panel>
</body>
</html>

10
src/main/webapp/css/scipro.css

@ -678,17 +678,17 @@ ul.multiobject-selected-list li {
}
.blue-tab-menu {
float:left;
width:100%;
/* background: url("../images/tab_bg.gif") repeat-x bottom;*/
font-size:100%;
/*float:left;*/
/*width:100%;*/
/*background: url("../images/tab_bg.gif") repeat-x bottom;*/
/*font-size:100%;*/ /* Obs: font-size: 100%; gör ingenting?? */
line-height:normal;
}
.blue-tab-menu img {
height: 12px;
vertical-align:middle;
}
.blue-tab-menu ul {
ul.blue-tab-menu {
margin:0;
padding: 0px 0px 0;
list-style:none;