Changeset 19756 in main
- Timestamp:
- 01/27/20 16:33:08 (3 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 2 deleted
- 50 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ibisph-admin/src/main/webapp/WEB-INF/web.xml
r17645 r19756 5 5 definitions for the IBIS-PH Admin application. The following comments 6 6 describe how requests flow, how an adopter should configure their webapp. 7 8 The configuration implemented in this file contains a basic configuration9 with NO security and direct file publishing.10 7 11 8 BASIC APPLICATION REQUEST FLOW: … … 36 33 controller should be used to handle the request. The dispatcher servlet 37 34 uses a URL to controller mapping that is specified in the dispatcher_servlet.xml 38 file but is typicallyoverridden via the site specific.xml spring file.35 file but can be overridden via the site specific.xml spring file. 39 36 6) The controller then receives the request and processes it according to 40 37 how it was coded and configured. The controller is responsible to 41 return a model (data to be presented) and a view (JSP in the case of 42 the admin app, ana XSLT in the case of the view app) back to the 43 Spring MVC Request Dispatcher servlet. 44 7) The dispatcher servlet then injects the model (data) into the specified 45 view (JSP) and a response is streamed back to the user. 38 return a model (java objects and collections of objects) and a view (JSP) 39 which provides the HTML page structure along with tags that define how 40 to display the model data in the HTML. 41 7) The dispatcher servlet then puts the data into the session for the view 42 to access, calls the view code to process, and streams back the response 43 to the user. 46 44 47 45 APPLICATION CONFIGURATION: … … 49 47 simply shows the 4 main types of configuration that an adopter needs to be 50 48 aware of to be able to properly configure and manage their application: 49 0) Configuration of a Java web app server complete with the jndi datasource 50 configuration and any app context configuration (either in a general 51 context file, app server specific context file, or the webapp's context.xml 52 file. 51 53 1) The web.xml file (this file) which contains four main adopter areas of 52 54 interest. … … 122 124 TC7 = Servlet 3.0 123 125 TC8 = Servlet 3.1 126 TC9 = Servlet 4.0 124 127 --> 125 128 <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" … … 149 152 <!-- =========================================== J N D I R E S O U R C E S --> 150 153 <!-- 151 JNDI Resources are resources that are defined and managed within an App 152 server (container managed) and are simply looked up and used within the 153 IBIS-PH application (think of these as a named service that IBIS-PH can 154 have access to and use). These app server container managed resources 155 have several important characteristics which include keeping sensitive 156 username/password information hidden from the public and providing a 157 mechanism for the application to be deployed into test and production 158 environments without having to change application configurations or 159 code. This also allows the application to be deployed to different 160 adopters again without having to change code or configurations (as long 161 as the adopter defines the resource with the expected lookup name). 162 163 IMPORTANT: Named JNDI resources consist of the app server object/service 154 JNDI Resources are resources that are referenced and used within the 155 IBIS-PH application. These resources are typically defined within the 156 app server so the container defines the resource with the approp enviro 157 properties including keeping the username and password secure. 158 159 Named JNDI resources consist of the app server object/service 164 160 definition which includes a resource name, the resource being exposed 165 161 to the app/associated with the app, and the IBIS-PH application code … … 168 164 updated accordingly. For example the IBIS-PH app is configured to 169 165 lookup a db connection object/resource via a name like: "jdbc/doh_ibisph" 170 and if Utah's IT's db connection naming standard requires them to use a 171 different name lookup value (something like: "jdbc/utah-doh-oracle-ibisph") 172 then the spring bean definition's jdbc JNDI name value would need to be 173 updated to match the new name "jdbc/utah-doh-oracle-ibisph" value. 174 However, IBIS-PH employs a name alias mechanism that if setup on the 175 app server correctly will alleviate the need to change the JNDI name 176 to be lookuped up by the IBIS-PH webapp. 177 178 Background on how all JNDI named resource lookups work. First you must 179 define the resource object within the app server container and give it 180 a name. This typically involves using an app server GUI to define and 181 name the resource (this can also be done manually by editing a server.xml 182 type file). Second the resource has to be made available/exposed to the 183 application(s). Third the application is coded to look up the resource 184 based on the resouce's defined name. For IBIS-PH the JNDI name to be 185 looked up is always an injected bean value that is specified in Spring 186 application context bean configuration file(s). 187 188 IBIS-PH JNDI resources are all referenced via the "resource-ref" entry 189 within this web.xml file. This mechanism provides a resource name alias 190 mechanism that allows the real resource definition to be named according 191 to the IT's naming conventions while still providing an standard IBIS 192 type name without having to change the IBIS spring bean file(s). This 193 resource alias also allows the IBIS application to startup without having 194 an actual resource defined (the application will not work properly but 195 it will start). 196 197 BASIC STEPS ON HOW TO SETUP A RESOURCE: 198 1) Put all resource associated jar files within the app server's lib area. 199 2) Within the application server, define the resource and give it a 200 name. This resource definition includes things like the object's 201 class name, username, password, addresses, any and all properties 202 that the resource needs to be able to function. 203 3) Associate/expose the resource to the application. In the case of 204 Tomcat if the resource is a global resource you can create a reference 205 via the ResourceLink element. This lists the resource's global name 206 and then defines the matching ibisph JNDI lookup name. Another option 207 within Tomcat is to define the resource within the application's context 208 definition. When this is done the name of the resource must match the 209 expected IBIS-PH name value. One other option exists and that is when 210 a global type resource is defined with the IBIS-PH name value. When 211 this is the case then no resource link is needed for that application's 212 context definition. This also avoids having to setup the application 213 within the app server's environment (depending on how the app server 214 is configured). In the case of Tomcat auto deploy an application 215 context is not needed if the global resource name(s) match. 216 4) If the app does not startup make sure the JNDI name set within the 217 app's Spring bean file(s) match the name specified in the above. The 218 Spring JNDI object reference also needs the property name="resourceRef" 219 to be set as value="true". 220 221 One other mechanism is to use the app's META-INF/context.xml and embed 222 the resource definition within. This can be useful for local development 223 but is not recommended as it potentially exposes sensitive information 224 if storing source code in an exposed repository etc. 225 226 EASIEST WAY (if using Tomcat): 227 1) Create a GlobalNamingResources / Resource for each ibis DB in server.xml. 228 2) Within the Resource element define a unique name like: 229 name="jdbc/doh_production_ibisph_admin_db" 230 and if another db then a new unique name like: 231 name="jdbc/doh_ibisph_test" (if there's a test and prod db instance). 232 3) Create an app context for each admin app that has the global name 233 the same value as the name defined in step 2. 234 235 <Context docBase="D:\ibis\trunk\ibisph-view\src\main\webapp" path="/ibisph-view" reloadable="false"> 236 <ResourceLink global="mail/doh_ibisph" name="mail/doh_ibisph" type="javax.mail.Session"/> 237 <ResourceLink global="jdbc/doh_production_ibisph_admin_db" name="jdbc/doh_ibisph" type="javax.sql.DataSource"/> 238 </Context> 239 240 IMPORTANT PART: The webapp's content ResourceLink/global value MUST 241 match the desired global datasource's name value. Then leave the 242 webapp's ResourceLink/name the default value of jdbc/doh_ibisph so 243 that no app configuration changes are needed. 244 245 For the test example: 246 <ResourceLink global="jdbc/doh_ibisph_test" name="jdbc/doh_ibisph" type="javax.sql.DataSource"/> 166 and if the adopter's IT db connection naming standard requires them to 167 use a different name for the resource lookup value (something like: 168 "jdbc/utah-doh-oracle-ibisph") then the spring bean definition's jdbc 169 JNDI name value would need to be updated to match the new name 170 "jdbc/utah-doh-oracle-ibisph" value. Of course there are lots of options 171 to accomplish this which includes global resource referencing, web.xml 172 resource wrapping, webapp context definitions, spring bean properties etc. 173 174 SOME OPTIONS ON HOW TO SETUP A RESOURCE FOR LOCAL TOMCAT DEVELOPMENT: 175 1) Everything within server.xml. This includes global JNDI resources 176 and a contexts for the view and admin app. This option has the 177 advantage of everything within one file. Disadvantages are that all 178 app will need a context and context definitions within server.xml 179 is highly discouraged with some stating that tomcat depreciated this 180 starting in TC5 (still works in TC9). 181 2) Resources within the main context.xml and apps all contained within 182 the [TC]/webapps dir. This is the easiest as all apps will have 183 access to all the resources and all apps are auto deployed without 184 any special docbase changes. 185 3) Resources in the server.xml or main context.xml with specific META-INF/ 186 context.xml or TC/config/localhost/app_name.xml context files. 187 188 The repo 1/23/2020 and prior has much more info on this subject with most 189 of the content providing accurate information (some isn't accurate as it 190 was simply unedited notes). 247 191 --> 248 <resource-ref>249 <description>Resource reference to the app server container managed JNDI database connection factory</description>250 <res-ref-name>jdbc/doh_ibisph</res-ref-name>251 <res-type>javax.sql.DataSource</res-type>252 <res-auth>Container</res-auth>253 </resource-ref>254 192 255 193 -
trunk/ibisph-view/src/content/xml/html_content/topic/Index.xml
r18555 r19756 16 16 <TITLE>North Dakota's Indicator-based Information System for Public Health (ND-IBIS) Topics</TITLE> 17 17 18 <OTHER_HEAD_CONTENT>19 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>20 </OTHER_HEAD_CONTENT>21 18 22 19 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/Introduction.xml
r18288 r19756 5 5 <TITLE>Indicator-based Information System for Public Health (IBIS-PH) Topics</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/healthcare/access/availability/Detail.xml
r18683 r19756 5 5 <TITLE>Availability of Health Care</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/healthcare/access/insurance/Detail.xml
r18683 r19756 5 5 <TITLE>Health Care Coverage and Cost</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/healthcare/utilization/immunization/Detail.xml
r18683 r19756 5 5 <TITLE>Immunization</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/healthcare/utilization/oral/Detail.xml
r18683 r19756 5 5 <TITLE>Oral Health</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/healthcare/utilization/other/Detail.xml
r18683 r19756 5 5 <TITLE>Other Clinical Preventive Services</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/healthcare/utilization/screening/cancer/Detail.xml
r18683 r19756 5 5 <TITLE>Cancer Screening</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/healthcare/utilization/screening/cardiovascular/Detail.xml
r18683 r19756 5 5 <TITLE>Cardiovascular Disease Screening</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/healthoutcome/cancer/Detail.xml
r18683 r19756 5 5 <TITLE>Cancer</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/healthoutcome/death/Detail.xml
r18683 r19756 5 5 <TITLE>Leading Causes of Death</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/healthoutcome/disease/chronic/Detail.xml
r18683 r19756 5 5 <TITLE>Chronic Diseases</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/healthoutcome/disease/infectious/Detail.xml
r18683 r19756 5 5 <TITLE>Infectious Disease</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/healthoutcome/injury/Detail.xml
r18683 r19756 5 5 <TITLE>Injury and Violence</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/healthoutcome/mch/Detail.xml
r18683 r19756 5 5 <TITLE>Maternal and Child Health</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/healthoutcome/measures/Detail.xml
r18683 r19756 5 5 <TITLE>Summary Measures of Health Status</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/healthoutcome/mental/Detail.xml
r18683 r19756 5 5 <TITLE>Mental Health</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/healthoutcome/substance/Detail.xml
r18683 r19756 5 5 <TITLE>Substance Use</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/population/demographic/characteristics/Detail.xml
r18683 r19756 5 5 <TITLE>Demographic Characteristics</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/population/socialdeterminant/community/Detail.xml
r18683 r19756 5 5 <TITLE>Social and Community Context</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/population/socialdeterminant/economic/Detail.xml
r18683 r19756 5 5 <TITLE>Economic Stability</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/population/socialdeterminant/education/Detail.xml
r18683 r19756 5 5 <TITLE>Education</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/population/socialdeterminant/neighborhood/Detail.xml
r18683 r19756 5 5 <TITLE>Neighborhood and Built Environment</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/risk_resiliency/behavior/activity/Detail.xml
r18683 r19756 5 5 <TITLE>Physical Activity</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/risk_resiliency/behavior/alcohol/Detail.xml
r18683 r19756 5 5 <TITLE>Alcohol Use</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/risk_resiliency/behavior/injury/Detail.xml
r18683 r19756 5 5 <TITLE>Injury Prevention</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/risk_resiliency/behavior/nutrition/Detail.xml
r18683 r19756 5 5 <TITLE>Nutrition</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/risk_resiliency/behavior/tobacco/Detail.xml
r18683 r19756 5 5 <TITLE>Tobacco</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/risk_resiliency/behavior/weight/Detail.xml
r18683 r19756 5 5 <TITLE>Overweight and Obesity</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/content/xml/html_content/topic/risk_resiliency/environment/physical/Detail.xml
r18683 r19756 5 5 <TITLE>Physical Environment</TITLE> 6 6 7 <OTHER_HEAD_CONTENT>8 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>9 </OTHER_HEAD_CONTENT>10 7 11 8 <CONTENT> -
trunk/ibisph-view/src/main/webapp/META-INF/context.xml.txt
r16030 r19756 1 1 Context Notes for the View app. Note that these "notes" are specific to Tomcat 2 but should also apply to other app containers. This context file is provide 2 but should also apply to other app containers. This context file is provided 3 3 to document potential usage. To use, make sure it is renamed to "context.xml". 4 4 Google "java webapp context.xml" for great info from a variety of sites. … … 16 16 (if the engine and host are named their default values) and is named the same 17 17 as the .war file filename. So if the deployment is ibisph-view-2.2.1.war then 18 this context file will be put and renamed as: 19 "tomcat/conf/Catalina/localhost/ibisph-view-2.2.1.xml" with the app being referenced 20 as server:port/ibisph-view-2.2.1/... 18 this context file will be placed and renamed as: 19 "tomcat/conf/Catalina/localhost/ibisph-view-2.2.1.xml" 20 with the app being referenced as: 21 server:port/ibisph-view-2.2.1/... 21 22 22 23 Also: for Tomcat, the Host element needs to have deployXML="true" which for … … 28 29 Put another way, the path attribute is pretty much ignored except for server.xml 29 30 30 To make this the default app in Tomcat simply rename the app's d ir to be ROOT31 or change the app's context path attribute in server.xml to be "/".31 To make this the default app in Tomcat simply rename the app's deployed directory 32 to be ROOT or change the app's context path attribute in server.xml to be "/". 32 33 33 34 Example: … … 50 51 Add this if you are using a db for file storage or user info (specified in 51 52 the conf/server.xml): 52 <ResourceLink global="jdbc/doh_ibisph " name="jdbc/doh_ibisph" type="javax.sql.Datasource"/>53 <ResourceLink global="jdbc/doh_ibisph[-some-global-name]" name="jdbc/doh_ibisph" type="javax.sql.Datasource"/> 53 54 54 55 IMPORTANT RESOURCE LINK NOTE: … … 73 74 74 75 <Context path="/ibisph-view" docBase="ibisph-view" crossContext="false" reloadable="false"> 76 <ResourceLink global="jdbc/doh_ibisph[-the-global-name]" name="jdbc/doh_ibisph" type="javax.sql.DataSource"/> 75 77 </Context> 76 78 -
trunk/ibisph-view/src/main/webapp/WEB-INF/web.xml
r19700 r19756 16 16 TC7 = Servlet 3.0 17 17 TC8 = Servlet 3.1 18 TC9 = Servlet 4.0 18 19 19 20 View version 2.3 and prior contained configurations for server side charts. … … 21 22 converted Agileblox SVG to a raster image. Code was also started that used 22 23 the JFreeChart for server side charts. This server side charting was 23 cleaned out of v3 since Kendo charts is a better library and the fact that24 the Agileblox code was not current nor able to be purchased.24 cleaned out of v3 since Kendo charts is a better library and the facts that 25 the Agileblox code was not current and able to be purchased by adopters. 25 26 --> 26 27 <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" … … 211 212 212 213 <!-- 213 Default publishing URL mapping that even if direct publishing is214 configured in the admin app does no harm as these URLs are never hit.215 -->216 <url-pattern>/publish/*</url-pattern>217 218 <!--219 214 Below are static content mappings that should route to a simple 220 215 file streaming controller. This mechanism allows adopters that -
trunk/ibisph-view/src/main/webapp/css/ExpandableContent.css
r19718 r19756 55 55 border-bottom: 1px solid #666; 56 56 border-right: 1px solid #666; 57 border-radius: var(--b order-radius-button);57 border-radius: var(--button-border-radius); 58 58 } 59 59 .ExpandableContent:hover > .Control, -
trunk/ibisph-view/src/main/webapp/css/ExpandableInputList.css
r7787 r19756 18 18 * Structure: 19 19 * --------------------------------------- 20 * ul.ExpandableInputList20 * [ul].ExpandableInputList - main container 21 21 * li 22 22 * input type="checkbox" id="xyz" class="Control" -
trunk/ibisph-view/src/main/webapp/css/ExpandableList.css
r19718 r19756 16 16 * Structure: 17 17 * --------------------------------------- 18 * ul.ExpandableList18 * [ul].ExpandableList - main container. 19 19 * li 20 * 20 * - if sub selections - 21 21 * input type="checkbox" id="xyz" 22 22 * label for="xyz" … … 142 142 143 143 144 .ExpandableList.TriangleControl li > input + label145 {146 padding-left: 25px;147 padding-right: 5px;148 background-image: url("../image/icon/16/triangle_down-gray.png");149 background-position: left 4px center;150 }151 .ExpandableList.TriangleControl li > input:not(:checked) + label152 {153 background-image: url("../image/icon/16/triangle_right-gray.png");154 }155 156 144 .ExpandableList.RightControl li > a, 157 145 .ExpandableList.RightControl li > div, -
trunk/ibisph-view/src/main/webapp/css/GridPanelList.css
r19718 r19756 7 7 * --------------------------------------- 8 8 * nav 9 * ul.HorizontalMenu10 * li - tab9 * [ul].HorizontalMenu 10 * li - first tab 11 11 * div.Panel 12 12 * div.Header … … 20 20 * div.Block 21 21 * div.Footer 22 * li .Sticky- second tab22 * li - second tab 23 23 * . . . 24 24 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ -
trunk/ibisph-view/src/main/webapp/css/HorizontalMenu.css
r19718 r19756 8 8 * Structure: 9 9 * --------------------------------------- 10 * ul.HorizontalMenu11 * 12 * [a, .Title, label]10 * [ul].HorizontalMenu 11 * li id="xxxxMenu" 12 * [a, .Title, label] 13 13 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ 14 14 -
trunk/ibisph-view/src/main/webapp/css/Popup.css
r19718 r19756 71 71 cursor: default; 72 72 73 border-radius: var(-- border-radius-container);73 border-radius: var(--container-border-radius); 74 74 box-shadow: 2px 2px 5px 0px #333; 75 75 transition: opacity 0.5s linear; … … 132 132 font-weight: normal; 133 133 134 border-radius: border-radius-container;134 border-radius: container-border-radius; 135 135 box-shadow: inset 2px 2px 5px 0px #333; 136 136 } -
trunk/ibisph-view/src/main/webapp/css/SlideOutContent.css
r19718 r19756 53 53 border-bottom: 1px solid #666; 54 54 border-right: 1px solid #666; 55 border-radius: var(--b order-radius-button);55 border-radius: var(--button-border-radius); 56 56 } 57 57 .SlideOutContent:hover > .Control, -
trunk/ibisph-view/src/main/webapp/css/TabbedContent.css
r19718 r19756 9 9 * Structure: 10 10 * --------------------------------------- 11 * ul or div class="TabbedContent"12 * li or span class="Tab"13 * input id="xyz" type="radio"14 * label for="xyz" class="Control"15 * div class="Container"11 * .TabbedContent 12 * li or span class="Tab" 13 * input id="xyz" type="radio" 14 * label for="xyz" class="Control" 15 * div class="Container" 16 16 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ 17 17 -
trunk/ibisph-view/src/main/webapp/css/VerticalMenu-Dropdown.css
r19700 r19756 9 9 * Structure: 10 10 * --------------------------------------- 11 * div - some container - no class - needed for elevator to be able to position. 12 * ul.VerticalMenu.ExpandableList 11 * [ul].VerticalMenu.ExpandableList - some container - needed for elevator to be able to position. 13 12 * li 14 13 * a -or- div -
trunk/ibisph-view/src/main/webapp/css/VerticalMenu-ExpandableList.css
r19718 r19756 14 14 * Structure: 15 15 * --------------------------------------- 16 * div- main container - no class - needed for elevator to be able to position.17 * [h2]18 * ul.VerticalMenu.ExpandableList[LeftControl]19 * li20 * input type="checkbox" id="xyz.#"21 * label for="xyz.#"22 * a -or- div - with title as text (if href then link to, else jump to).23 * ul24 * li16 * .VerticalMenu.ExpandableList - main container - no class - needed for elevator to be able to position. 17 * [h2] 18 * ul [LeftControl] 19 * li 20 * input type="checkbox" id="xyz.#" 21 * label for="xyz.#" 22 * a -or- div - with title as text (if href then link to, else jump to). 23 * ul 24 * li 25 25 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ 26 26 -
trunk/ibisph-view/src/main/webapp/css/VerticalMenu-Popout.css
r19700 r19756 7 7 * Structure: 8 8 * --------------------------------------- 9 * div- main container - no class - needed for elevator to be able to position.10 * ul class="VerticalMenu VerticalPopoutList"- sub dropdown menu container9 * .VerticalMenu.VerticalPopoutList - main container - no class - needed for elevator to be able to position. 10 * ul - sub dropdown menu container 11 11 * li 12 12 * a -or- div -
trunk/ibisph-view/src/main/webapp/css/VerticalMenu.css
r19718 r19756 7 7 * Structure: 8 8 * --------------------------------------- 9 * nav- main container.10 * [hx]11 * ul.VerticalMenu9 * .VerticalMenu - main container. 10 * h[x] 11 * ul 12 12 * li 13 * h 313 * h[x+1] 14 14 * ul 15 15 * li … … 18 18 .VerticalMenu 19 19 { 20 color: #003366;21 20 padding: 0 1px 0 0; 22 21 margin: 0; 23 22 list-style-type: none; 24 23 } 24 25 .VerticalMenu h2, 26 .VerticalMenu h3 27 { 28 color: var(--background-color); 29 background-color: var(--heading-color); 30 } 31 25 32 26 33 .VerticalMenu li -
trunk/ibisph-view/src/main/webapp/css/VerticalPopoutList.css
r19718 r19756 5 5 * Structure: 6 6 * --------------------------------------- 7 * ul.VerticalPopoutList8 * 9 * a -or- div - optional link selection10 * ul - sub popout menu (container)11 * li - menu item (control)12 * a -or- div - link7 * [ul, ol].VerticalPopoutList 8 * li - first level menu item (control) 9 * a -or- div - optional link selection 10 * ul - sub popout menu (container) 11 * li - menu item (control) 12 * a -or- div - link 13 13 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ 14 14 15 ul.VerticalPopoutList, 16 ul.VerticalPopoutList ul 15 .VerticalPopoutList 17 16 { 18 17 width: 150px; … … 33 32 } 34 33 35 ul.VerticalPopoutList li34 .VerticalPopoutList li 36 35 { 37 36 position: relative; /* allows sub menus absolute work relative to the menu item */ … … 43 42 box-shadow: inset 2px 0px 2px 0px #99ccff; 44 43 } 45 ul.VerticalPopoutList li:hover,46 ul.VerticalPopoutList li:active,47 ul.VerticalPopoutList li:focus44 .VerticalPopoutList li:hover, 45 .VerticalPopoutList li:active, 46 .VerticalPopoutList li:focus 48 47 { 49 48 background-color: #114477; … … 51 50 } 52 51 53 ul.VerticalPopoutList li > a,54 ul.VerticalPopoutList li > a:visited,55 ul.VerticalPopoutList li > div:first-child52 .VerticalPopoutList li > a, 53 .VerticalPopoutList li > a:visited, 54 .VerticalPopoutList li > div:first-child 56 55 { 57 56 display: block; … … 62 61 background-color: transparent; 63 62 } 64 ul.VerticalPopoutList li a:hover,65 ul.VerticalPopoutList li a:active,66 ul.VerticalPopoutList li a:focus63 .VerticalPopoutList li a:hover, 64 .VerticalPopoutList li a:active, 65 .VerticalPopoutList li a:focus 67 66 { 68 67 color: var(--color-hover); … … 83 82 */ 84 83 85 ul.VerticalPopoutList li ul84 .VerticalPopoutList li ul 86 85 { 87 86 position: absolute; … … 94 93 z-index: 1; 95 94 } 96 ul.VerticalPopoutList li:hover ul,97 ul.VerticalPopoutList li:active ul,98 ul.VerticalPopoutList li:focus ul95 .VerticalPopoutList li:hover ul, 96 .VerticalPopoutList li:active ul, 97 .VerticalPopoutList li:focus ul 99 98 { 100 99 visibility: visible; … … 103 102 } 104 103 105 ul.VerticalPopoutList li ul li104 .VerticalPopoutList li ul li 106 105 { 107 106 background-color: #336699; 108 107 box-shadow: inset 2px 0px 2px 0px #6699cc; 109 108 } 110 ul.VerticalPopoutList li ul li:hover,111 ul.VerticalPopoutList li ul li:active,112 ul.VerticalPopoutList li ul li:focus109 .VerticalPopoutList li ul li:hover, 110 .VerticalPopoutList li ul li:active, 111 .VerticalPopoutList li ul li:focus 113 112 { 114 113 background-color: #225588; … … 116 115 } 117 116 118 ul.VerticalPopoutList li ul li a,119 ul.VerticalPopoutList li ul li a:visited,120 ul.VerticalPopoutList li ul li div:first-child117 .VerticalPopoutList li ul li a, 118 .VerticalPopoutList li ul li a:visited, 119 .VerticalPopoutList li ul li div:first-child 121 120 { 122 121 padding: 7px 3px 7px 10px; -
trunk/ibisph-view/src/main/webapp/css/_general.css
r19742 r19756 8 8 :root 9 9 { 10 --color: #282828; 11 --background-color: #ffffff; 12 --heading-color: #003366; 10 13 --color-hover: #ffcc66; 11 14 --background-color-hover: #003366; 12 --b order-radius-button: 4px;13 -- border-radius-container: 5px;15 --button-border-radius: 4px; 16 --container-border-radius: 5px; 14 17 } 15 18 … … 22 25 padding: 0; 23 26 color: #282828; 27 color: var(--color); 24 28 25 29 /* browser calculates object width to include padding and border, default=content-box */ … … 57 61 font-weight: normal; 58 62 color: #003366; 63 color: var(--heading-color); 59 64 } 60 65 h1 … … 139 144 padding-left: 0.4em; 140 145 padding-right: 0.4em; 141 text-decoration: underline;142 146 color: #003366; 143 147 background-color: transparent; /* NN 4.x does better with general setter NOT specific one */ 148 text-decoration: underline; 144 149 } 145 150 a:visited, a:visited * {color: #663399;} … … 150 155 color: var(--color-hover); 151 156 background-color: var(--background-color-hover); 152 border-radius: var(--b order-radius-button);157 border-radius: var(--button-border-radius); 153 158 } 154 159 … … 178 183 margin-right: 6px; 179 184 padding-right: 4px; 185 186 color: #eee; 180 187 background-color: #225588; 181 color: #eee; 188 182 189 text-align: center; 183 190 cursor: pointer; 184 191 185 192 border: solid 1px #777; 186 border-radius: var(--b order-radius-button);193 border-radius: var(--button-border-radius); 187 194 box-shadow: inset 1px 1px 2px #bbb; 188 195 /* … … 196 203 color: var(--color-hover); 197 204 background-color: #114477; 205 background-color: var(--background-color-hover); 198 206 } 199 207 button:active -
trunk/ibisph-view/src/main/webapp/css/stylesheet.css
r19705 r19756 11 11 @import url("_layout.css"); 12 12 @import url("_layout-header.css"); 13 @import url("_layout-footer.css"); 13 14 14 15 /* major named class definitions */ -
trunk/ibisph-view/src/main/webapp/xslt/html/MenuSelectionsList.xslt
r19705 r19756 119 119 div class=Panel SELECTIONS/SELECTION/SELECTIONS 120 120 div class=Block SELECTIONS/SELECTION/SELECTIONS/SELECTION 121 [hx] 121 122 ul SELECTIONS/SELECTION/SELECTIONS/SELECTION/SELECTIONS 122 123 li SELECTIONS/SELECTION/SELECTIONS/SELECTION/SELECTIONS/SELECTION
Note: See TracChangeset
for help on using the changeset viewer.