Changeset d9cb4e2


Ignore:
Timestamp:
Jun 11, 2009 6:05:05 PM (11 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
821dcdd
Parents:
11ad98e
Message:
  • Console:
    • Move the console css from default.css in the .war to docs/themes/console/console.css, and support console themes in the main console with routerconsole.theme=foo
Files:
2 added
25 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/java/build.xml

    r11ad98e rd9cb4e2  
    7676    </target>
    7777    <target name="war" depends="precompilejsp">
     78        <!-- Don't include the css in the war, the main build.xml will copy it to docs/themes/console/ -->
    7879        <war destfile="build/routerconsole.war" webxml="../jsp/web-out.xml"
    79              basedir="../jsp/" excludes="web.xml, *.java, *.jsp, web-fragment.xml">
     80             basedir="../jsp/" excludes="web.xml, *.css, *.java, *.jsp, web-fragment.xml">
    8081        </war>
    8182    </target>
  • apps/routerconsole/jsp/config.jsp

    r11ad98e rd9cb4e2  
    44<html><head>
    55<title>I2P Router Console - config networking</title>
    6 <link rel="stylesheet" href="default.css" type="text/css" />
     6<%@include file="css.jsp" %>
    77</head><body>
    88
  • apps/routerconsole/jsp/configadvanced.jsp

    r11ad98e rd9cb4e2  
    55<html><head>
    66<title>I2P Router Console - config advanced</title>
    7 <link rel="stylesheet" href="default.css" type="text/css" />
     7<%@include file="css.jsp" %>
    88</head><body>
    99
  • apps/routerconsole/jsp/configclients.jsp

    r11ad98e rd9cb4e2  
    55<html><head>
    66<title>I2P Router Console - config clients</title>
    7 <link rel="stylesheet" href="default.css" type="text/css" />
     7<%@include file="css.jsp" %>
    88<style type='text/css'>
    99button span.hide{
  • apps/routerconsole/jsp/configkeyring.jsp

    r11ad98e rd9cb4e2  
    55<html><head>
    66<title>I2P Router Console - config keyring</title>
    7 <link rel="stylesheet" href="default.css" type="text/css" />
     7<%@include file="css.jsp" %>
    88</head><body>
    99
  • apps/routerconsole/jsp/configlogging.jsp

    r11ad98e rd9cb4e2  
    55<html><head>
    66<title>I2P Router Console - config logging</title>
    7 <link rel="stylesheet" href="default.css" type="text/css" />
     7<%@include file="css.jsp" %>
    88</head><body>
    99<jsp:useBean class="net.i2p.router.web.ConfigLoggingHelper" id="logginghelper" scope="request" />
  • apps/routerconsole/jsp/configpeer.jsp

    r11ad98e rd9cb4e2  
    55<html><head>
    66<title>I2P Router Console - config peers</title>
    7 <link rel="stylesheet" href="default.css" type="text/css" />
     7<%@include file="css.jsp" %>
    88</head><body>
    99
  • apps/routerconsole/jsp/configservice.jsp

    r11ad98e rd9cb4e2  
    55<html><head>
    66<title>I2P Router Console - config service</title>
    7 <link rel="stylesheet" href="default.css" type="text/css" />
     7<%@include file="css.jsp" %>
    88</head><body>
    99
  • apps/routerconsole/jsp/configstats.jsp

    r11ad98e rd9cb4e2  
    55<html><head>
    66<title>I2P Router Console - config stats</title>
    7 <link rel="stylesheet" href="default.css" type="text/css" />
     7<%@include file="css.jsp" %>
    88<script type="text/javascript">
    99function init()
  • apps/routerconsole/jsp/configtunnels.jsp

    r11ad98e rd9cb4e2  
    55<html><head>
    66<title>I2P Router Console - config tunnels</title>
    7 <link rel="stylesheet" href="default.css" type="text/css" />
     7<%@include file="css.jsp" %>
    88</head><body>
    99
  • apps/routerconsole/jsp/configupdate.jsp

    r11ad98e rd9cb4e2  
    55<html><head>
    66<title>I2P Router Console - config update</title>
    7 <link rel="stylesheet" href="default.css" type="text/css" />
     7<%@include file="css.jsp" %>
    88</head><body>
    99
  • apps/routerconsole/jsp/graphs.jsp

    r11ad98e rd9cb4e2  
    55<html><head>
    66<title>I2P Router Console - graphs</title>
    7 <link rel="stylesheet" href="default.css" type="text/css" />
     7<%@include file="css.jsp" %>
    88</head><body>
    99
  • apps/routerconsole/jsp/help.jsp

    r11ad98e rd9cb4e2  
    55<html><head>
    66<title>I2P Router Console - help</title>
    7 <link rel="stylesheet" href="default.css" type="text/css" />
     7<%@include file="css.jsp" %>
    88</head><body>
    99
  • apps/routerconsole/jsp/index.jsp

    r11ad98e rd9cb4e2  
    66<title>I2P Router Console - home</title>
    77<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
    8 <link rel="stylesheet" href="default.css" type="text/css" />
     8<%@include file="css.jsp" %>
    99<link rel="shortcut icon" href="favicon.ico" />
    1010</head><body>
  • apps/routerconsole/jsp/jobs.jsp

    r11ad98e rd9cb4e2  
    55<html><head>
    66<title>I2P Router Console - job queue</title>
    7 <link rel="stylesheet" href="default.css" type="text/css" />
     7<%@include file="css.jsp" %>
    88</head><body>
    99
  • apps/routerconsole/jsp/logs.jsp

    r11ad98e rd9cb4e2  
    55<html><head>
    66<title>I2P Router Console - logs</title>
    7 <link rel="stylesheet" href="default.css" type="text/css" />
     7<%@include file="css.jsp" %>
    88</head><body>
    99
  • apps/routerconsole/jsp/nav.jsp

    r11ad98e rd9cb4e2  
    11<%@page import="java.io.File" %>
    2 <% response.setHeader("Pragma", "no-cache");
    3    response.setHeader("Cache-Control","no-cache");
    4    response.setDateHeader("Expires", 0);
    5    // the above will b0rk if the servlet engine has already flushed
    6    // the response prior to including nav.jsp, so nav should be
    7    // near the top
    8    
    9    if (request.getParameter("i2p.contextId") != null) {
    10        session.setAttribute("i2p.contextId", request.getParameter("i2p.contextId"));
    11    }%>
    12 
    132<div class="logo">
    143 <a href="index.jsp"><img src="i2plogo.png" alt="Router Console" width="187" height="35" /></a><br />
     
    3625 <a href="oldstats.jsp">Stats</a> <!-- |
    3726 <a href="oldconsole.jsp">Internals</a> -->
    38 <% } %>
     27<% }
     28// the following is unused and a candidate for removal
     29%>
    3930 <jsp:useBean class="net.i2p.router.web.NavHelper" id="navhelper" scope="request" />
    4031 <jsp:setProperty name="navhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
  • apps/routerconsole/jsp/netdb.jsp

    r11ad98e rd9cb4e2  
    55<html><head>
    66<title>I2P Router Console - network database summary</title>
    7 <link rel="stylesheet" href="default.css" type="text/css" />
     7<%@include file="css.jsp" %>
    88</head><body>
    99
  • apps/routerconsole/jsp/oldconsole.jsp

    r11ad98e rd9cb4e2  
    55<html><head>
    66<title>I2P Router Console - internals</title>
    7 <link rel="stylesheet" href="default.css" type="text/css" />
     7<%@include file="css.jsp" %>
    88</head><body>
    99
  • apps/routerconsole/jsp/oldstats.jsp

    r11ad98e rd9cb4e2  
    55<html><head>
    66<title>I2P Router Console - statistics</title>
    7 <link rel="stylesheet" href="default.css" type="text/css" />
     7<%@include file="css.jsp" %>
    88</head><body>
    99
  • apps/routerconsole/jsp/peers.jsp

    r11ad98e rd9cb4e2  
    55<html><head>
    66<title>I2P Router Console - peer connections</title>
    7 <link rel="stylesheet" href="default.css" type="text/css" />
     7<%@include file="css.jsp" %>
    88</head><body>
    99
  • apps/routerconsole/jsp/profiles.jsp

    r11ad98e rd9cb4e2  
    55<html><head>
    66<title>I2P Router Console - peer profiles</title>
    7 <link rel="stylesheet" href="default.css" type="text/css" />
     7<%@include file="css.jsp" %>
    88</head><body>
    99
  • apps/routerconsole/jsp/summaryframe.jsp

    r11ad98e rd9cb4e2  
    5151    }
    5252%>
    53 <link rel="stylesheet" href="default.css" type="text/css" />
     53<%@include file="css.jsp" %>
    5454</head>
    5555
  • apps/routerconsole/jsp/tunnels.jsp

    r11ad98e rd9cb4e2  
    55<html><head>
    66<title>I2P Router Console - tunnel summary</title>
    7 <link rel="stylesheet" href="default.css" type="text/css" />
     7<%@include file="css.jsp" %>
    88</head><body>
    99
  • build.xml

    r11ad98e rd9cb4e2  
    372372        <!-- New readme_*.html files - For one release only -->
    373373        <copy file="readme_zh.html" todir="pkg-temp/docs/" />
     374        <!-- CSS now in docs/, not in the .war -->
     375        <copy file="apps/routerconsole/jsp/default.css" tofile="pkg-temp/docs/themes/console/console.css" />
     376        <copy file="apps/routerconsole/jsp/default.css" tofile="pkg-temp/docs/themes/console/defCon1/console.css" />
    374377    </target>
    375378    <target name="prepupdateRouter" depends="buildrouter, deletepkg-temp">
Note: See TracChangeset for help on using the changeset viewer.