I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit c3f7c5d1 authored by zzz's avatar zzz
Browse files

susidns: Move web resources to war

parent 127b93c1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 35 additions and 34 deletions
apps/susidns/src/build.xml
+ 4
− 3
View file @ c3f7c5d1
......@@ -168,9 +168,10 @@
<property name="workspace.changes.tr" value="" />
<war destfile="${project}.war" webxml="WEB-INF/web-out.xml">
<fileset dir=".">
<include name="WEB-INF/**/*.class"/>
<include name="svg/*"/>
<include name="js/*"/>
<include name="WEB-INF/**/*.class"/>
<include name="svg/*"/>
<include name="themes/**/*"/>
<include name="js/*"/>
</fileset>
<manifest>
<attribute name="Implementation-Version" value="${full.version}" />
......
apps/susidns/src/java/src/i2p/susi/dns/BaseBean.java
+ 1
− 1
View file @ c3f7c5d1
......@@ -29,7 +29,7 @@ public class BaseBean
private static final String RC_PROP_THEME_NAME = "routerconsole.theme";
private static final String PROP_THEME_NAME = "theme";
private static final String DEFAULT_THEME = "light";
private static final String BASE_THEME_PATH = "/themes/susidns/";
private static final String BASE_THEME_PATH = "themes/";
/** From CSSHelper */
private static final String PROP_DISABLE_OLD = "routerconsole.disableOldThemes";
private static final boolean DEFAULT_DISABLE_OLD = true;
......
apps/susidns/src/jsp/index.jsp
+ 1
− 1
View file @ c3f7c5d1
......@@ -86,7 +86,7 @@
</p>
<div class="illustrate">
<object type="image/svg+xml" data="images/how.svg?<%=net.i2p.CoreVersion.VERSION%>">
<img src="/themes/susidns/images/how.png" border="0" alt="address book working scheme" title="How the address book works" class="illustrate" />
<img src="images/how.png" border="0" alt="address book working scheme" title="How the address book works" class="illustrate" />
</object>
</div>
</div>
......
apps/routerconsole/jsp/themes/susidns/dark/susidns.css → apps/susidns/src/themes/dark/susidns.css
+ 20
− 20
View file @ c3f7c5d1
......@@ -118,29 +118,29 @@ body.iframed {
}
#navi a.abook {
background: #332940 url(/themes/susidns/images/abook.png) 5px center no-repeat;
background: url(/themes/susidns/images/abook.png) 5px center no-repeat, #332940;
background: #332940 url(../images/abook.png) 5px center no-repeat;
background: url(../images/abook.png) 5px center no-repeat, #332940;
}
#navi a.abook:hover, #navi a.abook:focus {
background: #332940 url(/themes/susidns/images/abook.png) 5px center no-repeat !important;
background: #332940 url(../images/abook.png) 5px center no-repeat !important;
}
#navi a.abook:active {
background: #da736b url(/themes/susidns/images/abook.png) 5px center no-repeat !important;
background: #da736b url(../images/abook.png) 5px center no-repeat !important;
}
#navi a#subs {
background: #332940 url(/themes/susidns/images/subs.png) 5px center no-repeat;
background: url(/themes/susidns/images/subs.png) 5px center no-repeat, #1F1A24;
background: #332940 url(../images/subs.png) 5px center no-repeat;
background: url(../images/subs.png) 5px center no-repeat, #1F1A24;
}
#navi a#subs:hover, #navi a#subs:focus {
background: #332940 url(/themes/susidns/images/subs.png) 5px center no-repeat !important;
background: #332940 url(../images/subs.png) 5px center no-repeat !important;
}
#navi a#subs:active {
background: #da736b url(/themes/susidns/images/subs.png) 5px center no-repeat !important;
background: #da736b url(../images/subs.png) 5px center no-repeat !important;
}
#navi a#config {
......@@ -156,16 +156,16 @@ body.iframed {
}
#navi a#overview {
background: #1F1A24 url(/themes/susidns/images/overview.png) 5px center no-repeat;
background: url(/themes/susidns/images/overview.png) 5px center no-repeat, #1F1A24;
background: #1F1A24 url(../images/overview.png) 5px center no-repeat;
background: url(../images/overview.png) 5px center no-repeat, #1F1A24;
}
#navi a#overview:hover, #navi a#overview:focus {
background: #1F1A24 url(/themes/susidns/images/overview.png) 5px center no-repeat !important;
background: #1F1A24 url(../images/overview.png) 5px center no-repeat !important;
}
#navi a#overview:active {
background: #1F1A24 url(/themes/susidns/images/overview.png) 5px center no-repeat !important;
background: #1F1A24 url(../images/overview.png) 5px center no-repeat !important;
}
/* end topnav */
......@@ -374,7 +374,7 @@ div#messages {
#messages + p, p.book {
border: 1px solid #292929;
background: #000 url(/themes/susidns/images/addressbook.png) 10px center no-repeat;
background: #000 url(../images/addressbook.png) 10px center no-repeat;
padding: 20px 20px 20px 50px !important;
}
......@@ -418,7 +418,7 @@ h4 {
border: 1px solid #292929;
padding: 8px 10px 8px 35px;
margin-bottom: 30px !important;
background: url(/themes/susidns/images/drive.png) 9px center no-repeat #332940 !important;
background: url(../images/drive.png) 9px center no-repeat #332940 !important;
}
a {
......@@ -903,7 +903,7 @@ input[name="search"]:focus {
.headline h3 {
padding: 10px 5px 10px 35px;
background: url(/themes/susidns/images/addressbook.png) 5px center no-repeat, #1F1A24;
background: url(../images/addressbook.png) 5px center no-repeat, #1F1A24;
font-size: 11pt;
text-transform: uppercase;
letter-spacing: 0.08em;
......@@ -911,16 +911,16 @@ input[name="search"]:focus {
}
.headline#subscriptions h3 {
background: url(/themes/susidns/images/subs_24.png) 5px center no-repeat;
background: url(../images/subs_24.png) 5px center no-repeat;
/*linear-gradient(to bottom, #1a261a 0%, #223022 7%, #212f21 9%, #172317 21%, #091109 49%, #050d05 50%, #020602 51%, #010301 53%, #000000 56%, #000000 100%);*/
background: url(/themes/susidns/images/subs_24.png) 5px center no-repeat;
background: url(../images/subs_24.png) 5px center no-repeat;
/*linear-gradient(to bottom, rgba(0,0,0,0) 50%, #000 50%), repeating-linear-gradient(to right, rgba(0,0,0,0.5) 1px, rgba(0,0,0,0.5) 2px, rgba(0,16,0,0.5) 2px, rgba(0,16,0,0.5) 4px), linear-gradient(to bottom, #004000, #000 75%);*/
}
.headline#configure h3 {
background: url(/themes/susidns/images/configure_24.png) 5px center no-repeat ;
background: url(../images/configure_24.png) 5px center no-repeat ;
/*, linear-gradient(to bottom, #1a261a 0%, #223022 7%, #212f21 9%, #172317 21%, #091109 49%, #050d05 50%, #020602 51%, #010301 53%, #000000 56%, #000000 100%);*/
background: url(/themes/susidns/images/configure_24.png) 5px center no-repeat;
background: url(../images/configure_24.png) 5px center no-repeat;
/*, linear-gradient(to bottom, rgba(0,0,0,0) 50%, #000 50%), repeating-linear-gradient(to right, rgba(0,0,0,0.5) 1px, rgba(0,0,0,0.5) 2px, rgba(0,16,0,0.5) 2px, rgba(0,16,0,0.5) 4px), linear-gradient(to bottom, #004000, #000 75%);*/
}
......@@ -950,7 +950,7 @@ p.book {
#messages + p, p.book {
border: 1px solid #292929;
background: #332940 url(/themes/susidns/images/addressbook.png) 5px center no-repeat;
background: #332940 url(../images/addressbook.png) 5px center no-repeat;
}
/* hide export button on published addressbook if empty */
......
apps/routerconsole/jsp/themes/susidns/light/susidns.css → apps/susidns/src/themes/light/susidns.css
+ 9
− 9
View file @ c3f7c5d1
......@@ -143,20 +143,20 @@ h3 {
.headline h3 {
font-size: 11.5pt !important;
background: url(/themes/susidns/images/addressbook.png) 6px center no-repeat #fcfcff;
background: url(/themes/susidns/images/addressbook.png) 6px center no-repeat, linear-gradient(to bottom, #fcfcff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,255,0.4)), linear-gradient(135deg, #fcfcff 5%, rgba(231, 231, 255, 0.8) 15%);
background: url(../images/addressbook.png) 6px center no-repeat #fcfcff;
background: url(../images/addressbook.png) 6px center no-repeat, linear-gradient(to bottom, #fcfcff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,255,0.4)), linear-gradient(135deg, #fcfcff 5%, rgba(231, 231, 255, 0.8) 15%);
background-size: 22px 22px, 100% 100%, 100% 100%;
}
.headline#subscriptions h3 {
background: url(/themes/susidns/images/subs_24.png) 6px center no-repeat #fcfcff;
background: url(/themes/susidns/images/subs_24.png) 6px center no-repeat, linear-gradient(to bottom, #fcfcff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,255,0.4)), linear-gradient(135deg, #fcfcff 5%, rgba(231, 231, 255, 0.8) 15%);
background: url(../images/subs_24.png) 6px center no-repeat #fcfcff;
background: url(../images/subs_24.png) 6px center no-repeat, linear-gradient(to bottom, #fcfcff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,255,0.4)), linear-gradient(135deg, #fcfcff 5%, rgba(231, 231, 255, 0.8) 15%);
background-size: 22px 22px, 100% 100%, 100% 100%;
}
.headline#configure h3 {
background: url(/themes/susidns/images/configure_24.png) 6px center no-repeat #fcfcff;
background: url(/themes/susidns/images/configure_24.png) 6px center no-repeat, linear-gradient(to bottom, #fcfcff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,255,0.4)), linear-gradient(135deg, #fcfcff 5%, rgba(231, 231, 255, 0.8) 15%);
background: url(../images/configure_24.png) 6px center no-repeat #fcfcff;
background: url(../images/configure_24.png) 6px center no-repeat, linear-gradient(to bottom, #fcfcff 50%, rgba(255,255,255,0.6) 50%, rgba(240,240,255,0.4)), linear-gradient(135deg, #fcfcff 5%, rgba(231, 231, 255, 0.8) 15%);
background-size: 22px 22px, 100% 100%, 100% 100%;
}
......@@ -178,7 +178,7 @@ span.location {
border-top: 1px solid #dee2e6;
margin: 5px -6px 0;
padding: 8px 10px 0 33px;
background: url(/themes/susidns/images/drive.png) 9px 7px no-repeat;
background: url(../images/drive.png) 9px 7px no-repeat;
}
#content {
......@@ -994,7 +994,7 @@ div#book, #emptybook {
}
p.book {
background: url(/themes/susidns/images/abook.png) 2px center no-repeat;
background: url(../images/abook.png) 2px center no-repeat;
padding: 5px 5px 5px 24px;
}
......@@ -1402,7 +1402,7 @@ input.export {
}
.headline h4 {
background: url(/themes/susidns/images/drive.png) no-repeat scroll 10px 8px;
background: url(../images/drive.png) no-repeat scroll 10px 8px;
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Base32 Address: [http://7qeve4v2chmjdqlwpa3vl7aojf3nodbku7vepnjwrsxljzqipz6a.b32.i2p] Onion Address: [http://47ggr2fa3vnwfyhvgskzdmr3i32eijwymxohtxsls45dulmriwxszjad.onion]