Menu
▾
▴
[Sageplugins-commit] JettyStarter/WebContent/apps HeaderBg.png, NONE, 1.1 apps.css, 1.1, 1.2 index.jsp, 1.2, 1.3
|
From: jreichen <jre...@us...> - 2011-01-02 03:24:41
|
Update of /cvsroot/sageplugins/JettyStarter/WebContent/apps In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2087/WebContent/apps Modified Files: apps.css index.jsp Added Files: HeaderBg.png Log Message: SageTV v7-style interface for 'apps' web application (switch from blue to gray as well as other style changes) --- NEW FILE: HeaderBg.png --- (This appears to be a binary file; contents omitted.) Index: apps.css =================================================================== RCS file: /cvsroot/sageplugins/JettyStarter/WebContent/apps/apps.css,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** apps.css 25 May 2010 03:22:47 -0000 1.1 --- apps.css 2 Jan 2011 03:24:32 -0000 1.2 *************** *** 1,20 **** ! body ! { ! font-family: Verdana, Helvetica, Arial, Tahoma; ! font-size: 12pt; ! background: #042360; ! color: #FFFFFF; ! ! -webkit-text-size-adjust: none; } ! .content ! { } ! .header ! { ! /*background: url(border.png);*/ ! /*border: 2px solid #FFFFFF;*/ border: none; text-align: center; --- 1,26 ---- ! body { ! font-family: 'Helvetica', 'Verdana', 'Tahoma', 'Arial'; ! font-size: 12pt; ! text-shadow: rgba(0, 0, 0, 0.7) 1px 1px 0; ! background-color: #606060; ! color: #FFFFFF; ! margin: 0px; ! overflow-x: hidden; ! -webkit-user-select: none; ! -webkit-text-size-adjust: none; } ! p { ! margin: 4px 0px 0px 0px; ! word-wrap: break-word; } ! .content { ! font-size: 16px; ! margin-bottom: 0px; ! padding: 5px 10px; ! } ! ! .header { border: none; text-align: center; *************** *** 24,50 **** font-weight: bold; ! padding: 5px; ! ! -moz-border-radius-topleft: 8px; ! -moz-border-radius-topright: 8px; ! -moz-border-radius-bottomleft: 8px; ! -moz-border-radius-bottomright: 8px; ! ! -webkit-border-radius: 8px; ! ! border-radius: 8px; ! ! /*-webkit-border-image: function top right bottom left / top_border right_border bottom_border left_border x_repeat y_repeat;*/ ! /*-webkit-border-image: -webkit-gradient(linear, left top, right top, from(#FFFFFFFF), to(#FFFFFFFF), color-stop(0.5, #FFFFFF)) 2 2 2 2 repeat repeat;*/ } ! .footer ! { ! font-size: 10pt; } a, a:link, a:hover, a:visited { ! color: #042360; text-decoration: none; } --- 30,75 ---- font-weight: bold; ! padding: 0px; } ! .titlebar { ! height: 70px; ! text-align: center; ! vertical-align: middle; ! background-image: url(HeaderBg.png); ! background-repeat: repeat-x; ! ! box-shadow: 0px 0px 10px rgba(0, 0, 0, 1.0); ! -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 1.0); ! -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 1.0); ! } ! ! .titlebar img, .titlebar a { ! vertical-align: middle; ! } ! ! .titlebar .logo { ! margin-top: 5px; ! } ! ! .header .title { ! font-weight: bold; ! font-size: 22px; ! text-align: center; ! vertical-align: middle; ! margin: 0px; ! padding-top: 10px; ! padding-bottom: 10px; ! } ! ! .footer { ! font-size: 14px; ! padding: 5px; ! border: none; } a, a:link, a:hover, a:visited { ! color: #111111; text-decoration: none; } *************** *** 52,55 **** --- 77,81 ---- ul { + margin: 0px; padding: 0px; } *************** *** 60,69 **** background: #FFFFFF; ! color: #042360; ! font-weight: bold; vertical-align: middle; ! border-bottom: 1px solid #042360; } --- 86,97 ---- background: #FFFFFF; ! color: #111111; ! font-weight: bold; vertical-align: middle; ! border-bottom: 1px solid #909090; ! ! text-shadow: none; } *************** *** 71,75 **** { color: white; ! background: #263D6C; } --- 99,103 ---- { color: white; ! background: #111111; } *************** *** 96,99 **** --- 124,129 ---- border-bottom-left-radius: 8px; border-bottom-right-radius: 8px; + + border-bottom: none; } *************** *** 120,124 **** .appdetails { ! font-size: 10pt; padding-left: 10px; } --- 150,155 ---- .appdetails { ! font-size: 14px; ! color: #909090; padding-left: 10px; } Index: index.jsp =================================================================== RCS file: /cvsroot/sageplugins/JettyStarter/WebContent/apps/index.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index.jsp 31 May 2010 04:20:35 -0000 1.2 --- index.jsp 2 Jan 2011 03:24:32 -0000 1.3 *************** *** 6,9 **** --- 6,10 ---- <%@ page import="java.util.Collections" %> <%@ page import="java.util.Comparator" %> + <%@ page import="java.util.Date" %> <%@ page import="java.util.List" %> <%@ page import="org.mortbay.jetty.Handler" %> *************** *** 11,15 **** <%@ page import="org.mortbay.jetty.Server" %> <%@ page import="org.mortbay.resource.Resource" %> ! <%@page import="sagex.api.PluginAPI"%> <%@ page import="sagex.jetty.starter.JettyInstance" %> --- 12,16 ---- <%@ page import="org.mortbay.jetty.Server" %> <%@ page import="org.mortbay.resource.Resource" %> ! <%@ page import="sagex.api.PluginAPI"%> <%@ page import="sagex.jetty.starter.JettyInstance" %> *************** *** 19,22 **** --- 20,26 ---- <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <meta http-equiv="Cache-Control" content="no-cache"/> + <meta http-equiv="Pragma" content="no-cache"/> + <meta http-equiv="Expires" content="0"/> <title>SageTV Web Applications</title> <link rel="stylesheet" type="text/css" href="apps.css"/> *************** *** 30,42 **** </head> <body> <div class="content"> - <div class="header"> - <div><img src="SageLogo256small.png" alt="SageTV" title="SageTV"/></div> - <div>Web Applications</div> - </div> <% JettyInstance instance = JettyInstance.getInstance(); Server server = instance.getServers().get(0); Handler[] handlerArray = (server == null) ? null : server.getChildHandlersByClass(ContextHandler.class); --- 34,49 ---- </head> <body> + + <div class="header"> + <div class="titlebar"><img class="logo" src="SageLogo256small.png" alt="SageTV" title="SageTV"/></div> + <div class="title">Web Applications</div> + </div> + <div class="content"> <% JettyInstance instance = JettyInstance.getInstance(); Server server = instance.getServers().get(0); + ContextHandler consoleContext = null; Handler[] handlerArray = (server == null) ? null : server.getChildHandlersByClass(ContextHandler.class); *************** *** 53,56 **** --- 60,68 ---- continue; } + if ("/console".equals(context.getContextPath())) + { + consoleContext = context; + continue; + } handlerList.add(context); } *************** *** 137,141 **** { out.write("<li>"); ! out.write("<img class=\"app\" src=\"" + favIconPath + "\"/>"); out.write("<div class=\"appinfo\">"); if (context.getDisplayName() != null) --- 149,153 ---- { out.write("<li>"); ! out.write("<div class=\"appimg\"><img class=\"app\" src=\"" + favIconPath + "\"/></div>"); out.write("<div class=\"appinfo\">"); if (context.getDisplayName() != null) *************** *** 162,165 **** --- 174,202 ---- %> </ul> + + <% + if (consoleContext != null) + { + %> + <ul> + <li><a href="/console"> + <div class="appimg"><img class="app" src="/console/favicon.ico"/></div> + <div class="appinfo">Settings + <div class="appdetails"> + <% + if (consoleContext.getAttribute("pluginid") != null) + { + Object plugin = PluginAPI.GetAvailablePluginForID(consoleContext.getAttribute("pluginid").toString()); + out.write("Version " + PluginAPI.GetPluginVersion(plugin)); + } + %> + </div> + </div> + </a></li> + </ul> + <% + } + %> + <% for (int i = 0; i < 10; i++) *************** *** 169,178 **** } %> - <div class="footer"> - Jetty Web Server Plugin Version <%= sagex.jetty.starter.JettyPlugin.class.getPackage().getImplementationVersion() %><br/> - Jetty Web Server Version <%= Server.class.getPackage().getImplementationVersion() %> - </div> </div> </body> </html> - --- 206,217 ---- } %> </div> + + <div class="footer"> + <p>Page Generated <%= new Date() %></p> + <p>Jetty Web Server Plugin Version <%= sagex.jetty.starter.JettyPlugin.class.getPackage().getImplementationVersion() %></p> + <p>Jetty Web Server Version <%= Server.class.getPackage().getImplementationVersion() %></p> + </div> + </body> </html> |
