Changeset 5559
- Timestamp:
- 08/18/14 14:22:07 (10 years ago)
- Location:
- VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/AuthenticationStatePanel.html
r906 r5559 9 9 <div wicket:id="login"></div> 10 10 <wicket:fragment wicket:id="loginFragment"> 11 Anonymous <a wicket:id="loginLink" href="#">[Login]</a> 11 <a wicket:id="loginLink" id="login" class="glyphicon glyphicon-log-in" href="#"> 12 <span>LOGIN</span> 13 </a> 12 14 </wicket:fragment> 13 15 … … 15 17 <wicket:fragment wicket:id="logoutFragment"> 16 18 <span wicket:id="username">username</span> 17 <!-- <a wicket:id="logoutLink" href="#">[Logout]</a>-->19 <!--<a wicket:id="logoutLink" id="logout" class="glyphicon glyphicon-log-out" href="#"><span>LOGOUT</span></a>--> 18 20 </wicket:fragment> 19 21 </wicket:panel> -
VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BasePage.html
r5505 r5559 1 1 <?xml version="1.0" encoding="UTF-8"?> 2 2 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 3 3 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 4 4 <html xmlns="http://www.w3.org/1999/xhtml" 5 5 xmlns:wicket="http://wicket.apache.org/"> 6 <head> 7 <title>CLARIN Virtual Collection Registry</title> 8 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 9 <link href="css/vcr.css" rel="stylesheet" type="text/css" /> 10 </head> 11 <body> 12 <noscript> 13 <div id="noscript-warning">Virtual Collection Registry requires JavaScript to be enabled!</div> 14 </noscript> 15 <div id="container"> 16 <div id="header"> 17 <div id="header-logo"> 18 <div id="clarin-logo" /> 19 <div id="ids-logo"/> 20 <h1>Virtual Collection Registry</h1> 6 <head> 7 <title>CLARIN Virtual Collection Registry</title> 8 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 9 <link href="css/vcr.css" rel="stylesheet" type="text/css" /> 10 <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css"> 11 </head> 12 <body> 13 <noscript> 14 <div id="noscript-warning">Virtual Collection Registry requires JavaScript to be enabled!</div> 15 </noscript> 16 17 18 <div id="body"> 19 <div class="navbar navbar-default navbar-fixed-top" role="navigation"> 20 <div class="container"> 21 <div class="navbar-header"> 22 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> 23 <span class="sr-only">Toggle navigation</span> 24 <span class="icon-bar"></span> 25 <span class="icon-bar"></span> 26 <span class="icon-bar"></span> 27 </button> 28 <a class="navbar-brand" href="/"><header>Virtual Collection Registry</header></a> 29 </div> 30 31 <div class="navbar-collapse collapse"> 32 <wicket:container wicket:id="menu"></wicket:container> 33 <ul id="CLARIN_header_right" class="nav navbar-nav navbar-right"> 34 <li wicket:id="authstate">[auth]</li> 35 </ul> 36 </div> 37 </div> 38 </div> 39 <div id="push"></div> 40 <div class="container"> 41 <div id="feedback" wicket:id="feedback">[Feedback]</div> 42 <wicket:child /> 43 </div> 21 44 </div> 22 <div id="navigation"> 23 <div id="menu" wicket:id="menu"></div> 24 <div id="login"> 25 <div wicket:id="authstate"></div> 26 </div> 45 46 <div id="footer"> 47 <div class="container"> 48 <div id="CLARIN_footer_left"> 49 <a title="about" href="?view=about"><span>VERSION ${pom.version} </span><span class="glyphicon glyphicon-info-sign"></span></a> 50 </div> 51 <div id="CLARIN_footer_middle"> 52 <a title="CLARIN ERIC" href="https://www.clarin.eu/"><img src="//infra.clarin.eu/content/CLARIN-logo-4C14-60pxh.png" alt="CLARIN ERIC logo"/></a> 53 </div> 54 <div id="CLARIN_footer_right"> 55 <a title="contact" class="glyphicon glyphicon-envelope" href="mailto:centre-registry@clarin.eu"><span> CONTACT</span></a> 56 </div> 57 </div> 27 58 </div> 28 </div> 29 <div id="feedback" wicket:id="feedback">[Feedback]</div> 30 <div id="content"><wicket:child /></div> 31 <div class="push"></div> 32 </div> 33 <div id="footer"> 34 Version ${pom.version} 35 </div> 36 </body> 59 </body> 37 60 </html> -
VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/Menu.html
r926 r5559 1 1 <?xml version="1.0" encoding="UTF-8"?> 2 2 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 3 3 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 4 4 <html xmlns="http://www.w3.org/1999/xhtml" 5 5 xmlns:wicket="http://wicket.apache.org/"> 6 <head />7 <body>8 <wicket:panel>9 <div id="menu">10 <ul>11 <li wicket:id="menuitems"><div wicket:id="menuitem"></div></li>12 </ul>13 </div>14 </wicket:panel>15 </body>6 <head /> 7 <body> 8 <wicket:panel> 9 <ul class="nav navbar-nav"> 10 <wicket:container wicket:id="menuitems"> 11 <li wicket:id="menuitem">[item]</li> 12 </wicket:container> 13 </ul> 14 </wicket:panel> 15 </body> 16 16 </html> -
VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/MenuItem.html
r926 r5559 1 1 <?xml version="1.0" encoding="UTF-8"?> 2 2 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 3 3 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 4 4 <html xmlns="http://www.w3.org/1999/xhtml" 5 5 xmlns:wicket="http://wicket.apache.org/"> 6 <head />7 <body>8 <wicket:panel>9 <a wicket:id="link" href="#"><span wicket:id="title">Title</span></a>10 </wicket:panel>11 </body>6 <head /> 7 <body> 8 <wicket:panel> 9 <a wicket:id="link" href="#"><span wicket:id="title">Title</span></a> 10 </wicket:panel> 11 </body> 12 12 </html> -
VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/MenuItem.java
r927 r5559 1 1 package eu.clarin.cmdi.virtualcollectionregistry.gui.pages; 2 2 3 import eu.clarin.cmdi.virtualcollectionregistry.gui.Application; 4 import org.apache.wicket.AttributeModifier; 3 5 import org.apache.wicket.authorization.IAuthorizationStrategy; 4 6 import org.apache.wicket.authorization.strategies.role.annotations.AuthorizeAction; 5 import org.apache.wicket.markup.ComponentTag;6 7 import org.apache.wicket.markup.html.WebPage; 7 8 import org.apache.wicket.markup.html.basic.Label; … … 9 10 import org.apache.wicket.markup.html.link.Link; 10 11 import org.apache.wicket.markup.html.panel.Panel; 12 import org.apache.wicket.model.AbstractReadOnlyModel; 11 13 import org.apache.wicket.model.IModel; 14 import org.apache.wicket.model.Model; 12 15 import org.apache.wicket.util.lang.Classes; 13 14 import eu.clarin.cmdi.virtualcollectionregistry.gui.Application;15 16 16 17 @SuppressWarnings("serial") 17 18 public class MenuItem<T extends WebPage> extends Panel { 19 18 20 private static final String ENABLE = "ENABLE"; 19 21 private final String pageClassName; … … 22 24 super("menuitem"); 23 25 this.pageClassName = pageClass.getName(); 24 setRenderBodyOnly(true); 25 final Link<T> link = new BookmarkablePageLink<T>("link", pageClass) { 26 final Link<T> link = new BookmarkablePageLink<T>("link", pageClass) 27 .setAutoEnable(false); 28 link.add(new Label("title", title).setRenderBodyOnly(true)); 29 add(link); 30 31 add(new AttributeModifier("class", true, new AbstractReadOnlyModel<String>() { 26 32 @Override 27 protected void onComponentTag(ComponentTag tag) { 28 super.onComponentTag(tag); 29 if (linksTo(getPage())) { 30 tag.setName("span"); 31 tag.getAttributes().remove("href"); 32 tag.getAttributes().put("class", "active"); 33 public String getObject() { 34 if (pageClass.equals(getPage().getClass())) { 35 return "active"; 36 } else { 37 return null; 33 38 } 34 39 } 35 }; 36 link.add(new Label("title", title).setRenderBodyOnly(true)); 37 add(link); 40 })); 38 41 } 39 42 40 43 @Override 41 44 protected void onBeforeRender() { 42 final IAuthorizationStrategy strategy =43 getApplication().getSecuritySettings()45 final IAuthorizationStrategy strategy 46 = getApplication().getSecuritySettings() 44 47 .getAuthorizationStrategy(); 45 48 final Class<T> pageClass = getPageClass(); 46 49 if (!strategy.isInstantiationAuthorized(pageClass)) { 47 50 boolean visible = true; 48 AuthorizeAction action =49 pageClass.getAnnotation(AuthorizeAction.class);51 AuthorizeAction action 52 = pageClass.getAnnotation(AuthorizeAction.class); 50 53 if ((action != null) && ENABLE.equalsIgnoreCase(action.action())) { 51 54 final Application app = (Application) getApplication(); -
VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/webapp/css/vcr.scss
r5558 r5559 1 * { 2 margin: 0; 3 /* padding: 0; */ 4 } 5 6 html { 7 overflow-y: scroll 8 } 9 10 html, body { 11 font-family: Verdana, sans-serif; 12 font-size: 12px; 13 margin: 0 auto; 14 padding: 0; 15 line-height: 1; 16 height: 100%; 17 color: #000000; 18 /* background-color: #E9EEFA; */ 19 width: 990px; 20 min-width: 990px; 21 height: 100%; 22 } 1 @import 'CLARIN'; 23 2 24 3 noscript { … … 46 25 } 47 26 48 #header {49 border-top: 2px solid #D4DEEF;50 }51 52 #header-logo {53 margin: 0;54 padding: 5px;55 height: 70px;56 color: #004071;57 background-color: #E9EEF7;58 }59 60 #header-logo #clarin-logo {61 background: transparent url('../images/clarin-logo.png') no-repeat;62 float: left;63 width: 298px;64 height: 70px;65 }66 67 #header-logo #ids-logo {68 background: transparent url('../images/ids-logo.png') no-repeat;69 float: right;70 width: 55px;71 height: 70px;72 }73 74 #header-logo h1 {75 margin: 0 55px 0 298px;76 padding: 0 32px 0 32px;77 height: 70px;78 line-height: 70px;79 font-size: 34px;80 font-weight: bold;81 font-variant: small-caps;82 }83 84 #navigation {85 margin: 0;86 padding: 0;87 height: 20px;88 clear: both;89 color: #000000;90 background-color: #D4DEEF;91 font-size: 12px;92 line-height: 12px;93 vertical-align: middle;94 }95 96 #menu {97 margin: 0 100px 0 0;98 }99 100 #menu ul {101 list-style-type: none;102 margin: 0;103 padding: 0;104 }105 106 #menu li {107 float: left;108 margin-left: 4px;109 }110 111 #menu a, #menu span.active {112 display: block;113 margin: 0;114 padding: 4px 8px;115 width: auto;116 height: 12px;117 text-align: center;118 text-decoration: none;119 font-weight: bold;120 }121 122 #menu ul li + #menu ul li {123 border-left: 1px solid black;124 }125 126 #menu a, #menu a:active, #menu a:visited {127 color: #000000;128 background-color: inherit;129 }130 131 #menu a:hover {132 color: #AE0000;133 background-color: #E9EEF7;134 }135 136 #menu span.active {137 font-style: italic;138 }139 140 #login {141 float: right;142 padding: 4px 4px 4px 4px;143 width: auto;144 }145 146 #container {147 min-height: 100%;148 height: auto !important;149 height: 100%;150 margin: 0 auto -20px; /* the bottom margin is the negative value of the footer's height */151 color: #000000;152 background-color: #FFFFFF;153 border-left: 2px solid #D4DEEF;154 border-right: 2px solid #D4DEEF;155 }156 157 #content {158 margin: 0;159 padding: 0;160 }161 162 #container .push {163 height: 20px;164 width: auto;165 }166 167 #footer {168 padding: 0 4px;169 margin: 0 auto;170 height: 18px;171 line-height: 18px;172 text-align: right;173 color: #004071;174 background-color: #D4DEEF;175 border-left: 2px solid #D4DEEF;176 border-right: 2px solid #D4DEEF;177 border-bottom: 2px solid #D4DEEF;178 }179 180 /* general */181 input, select, textarea {182 font-family: Verdana, sans-serif;183 font-size: 100%;184 border: 1px solid #000000;185 }186 187 27 /* 188 28 * wizard … … 221 61 margin: 0 0 0 0; 222 62 } 223 224 /*225 form.wizard fieldset legend {226 font-size: 150%;227 font-weight: normal;228 color: #000000;229 margin: 0 0 0 0;230 padding: 0 5px;231 }232 233 div.wizard label {234 font-size: 100%;235 }236 237 div.wizard label u {238 font-style: normal;239 text-decoration: underline;240 }241 242 div.wizard input, div.wizard select, div.wizard textarea {243 font-family: Tahoma, Arial, sans-serif;244 font-size: 100%;245 color: #000000;246 }247 248 div.wizard textarea {249 overflow: auto;250 }251 */252 63 253 64 form.wizard div, … … 342 153 } 343 154 344 /*345 div.optional label:after {346 content: ':';347 }348 349 div.required label:after {350 content: ':';351 }352 */353 354 155 form.wizard textarea { 355 156 font-family: Verdana, sans-serif; … … 374 175 } 375 176 376 /*377 form.wizard div label.labelCheckbox, form div label.labelRadio {378 float: none;379 display: block;380 width: 200px;381 zoom: 1;382 padding: 0;383 margin: 0 0 5px 142px;384 text-align: left;385 }386 387 form.wizard div fieldset label.labelCheckbox, form div fieldset label.labelRadio {388 margin: 0 0 5px 0;389 width: 170px;390 }391 392 form.wizard div img {393 float: left;394 border: 1px solid #000000;395 margin: 0 0 5px 0;396 }397 398 p.error {399 background-color: #ff0000;400 background-image: url(/images/icon_error.gif);401 background-repeat: no-repeat;402 background-position: 3px 3px;403 color: #ffffff;404 padding: 3px 3px 5px 27px;405 border: 1px solid #000000;406 margin: auto 100px;407 }408 409 form.wizard div.error {410 background-color: #ffffe1;411 background-image: url(/images/required_bg.gif);412 background-repeat: no-repeat;413 background-position: top left;414 color: #666666;415 border: 1px solid #ff0000;416 }417 418 form.wizard div.error p.error {419 background-image: url(/images/icon_error.gif);420 background-position: top left;421 background-color: transparent;422 border-style: none;423 font-size: 88%;424 font-weight: bold;425 margin: 0 0 0 118px;426 width: 200px;427 color: #ff0000;428 }429 430 form.wizard div select, form div textarea {431 width: 200px;432 padding: 1px 3px;433 margin: 0 0 0 0;434 }435 436 form.wizard div input.inputText, form div input.inputPassword {437 width: 200px;438 padding: 1px 3px;439 margin: 0 0 0 0;440 }441 442 form.wizard div input.inputFile {443 width: 211px;444 }445 446 form.wizard div select.selectOne, form div select.selectMultiple {447 width: 211px;448 padding: 1px 3px;449 }450 451 form.wizard div input.inputCheckbox, form div input.inputRadio, input.inputCheckbox, input.inputRadio {452 display: inline;453 height: auto;454 width: auto;455 background-color: transparent;456 border-width: 0;457 padding: 0;458 margin: 0 0 0 140px;459 }460 461 form.wizard div.submit {462 width: 214px;463 padding: 0 0 0 146px;464 }465 466 form.wizard div.submit div {467 display: inline;468 float: left;469 text-align: left;470 width: auto;471 padding: 0;472 margin: 0;473 }474 475 form.wizard div input.inputSubmit,476 form div input.inputButton, input.inputSubmit, input.inputButton {477 background-color: #cccccc;478 color: #000000;479 width: auto;480 padding: 0 6px;481 margin: 0;482 }483 484 form.wizard div.submit div input.inputSubmit,485 form div.submit div input.inputButton {486 float: right;487 margin: 0 0 0 5px;488 }489 490 form.wizard div small {491 display: block;492 margin: 0 0 5px 142px;493 padding: 1px 3px;494 font-size: 88%;495 zoom: 1;496 }497 */498 499 177 form.wizard .wizardButtons { 500 178 border-top: 1px solid #000000; … … 509 187 } 510 188 511 /*512 form.wizard .buttonbar input.button,513 div.modalDialog div.modalDialogButtons input.button514 */515 189 input.button { 516 190 padding: 1px 4px; … … 537 211 } 538 212 539 540 213 /* 541 214 * modal dialog … … 626 299 } 627 300 628 301 /* 629 302 table { 630 303 font-size: 100%; … … 645 318 border-top: 1px solid #000000; 646 319 border-bottom: 1px solid #000000; 647 } 320 }*/ 648 321 649 322 table td.action { … … 672 345 } 673 346 674 a { 675 color: #AE0000; 676 background-color: inherit; 677 text-decoration: none; 678 } 679 680 table tbody { 681 border-bottom: 1px solid #000000; 682 } 683 684 table tr.even { 685 color: inherit; 686 background-color: #FFFFFF; 687 } 688 689 table tr.odd { 690 color: inherit; 691 background-color: #E9EEF7; 692 } 693 347 /* 694 348 table td.norecords-td { 695 349 text-align: center; … … 705 359 clear: none !important; 706 360 } 361 */ 707 362 708 363 table.creatorsTable,
Note: See TracChangeset
for help on using the changeset viewer.