Changeset 19756 in main


Ignore:
Timestamp:
01/27/20 16:33:08 (3 years ago)
Author:
GarthBraithwaite_STG
Message:

admin, view - TEMP COMMIT. web.xml internal docs. context updates. css cleanup - removed Edit.css and _topic.css

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  
    55        definitions for the IBIS-PH Admin application.  The following comments
    66        describe how requests flow, how an adopter should configure their webapp.
    7 
    8         The configuration implemented in this file contains a basic configuration
    9         with NO security and direct file publishing. 
    107
    118        BASIC APPLICATION REQUEST FLOW:
    … …  
    3633           controller should be used to handle the request.  The dispatcher servlet
    3734           uses a URL to controller mapping that is specified in the dispatcher_servlet.xml
    38            file but is typically overridden via the site specific.xml spring file.
     35           file but can be overridden via the site specific.xml spring file.
    3936        6) The controller then receives the request and processes it according to
    4037           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.
    4644
    4745        APPLICATION CONFIGURATION:
    … …  
    4947        simply shows the 4 main types of configuration that an adopter needs to be
    5048        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.
    5153        1) The web.xml file (this file) which contains four main adopter areas of
    5254           interest. 
    … …  
    122124        TC7 = Servlet 3.0
    123125        TC8 = Servlet 3.1
     126        TC9 = Servlet 4.0
    124127-->
    125128<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
    … …  
    149152        <!-- =========================================== J N D I   R E S O U R C E S -->
    150153        <!--
    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
    164160                definition which includes a resource name, the resource being exposed
    165161                to the app/associated with the app, and the IBIS-PH application code
    … …  
    168164                updated accordingly.  For example the IBIS-PH app is configured to
    169165                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).
    247191        -->
    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>
    254192
    255193

  • trunk/ibisph-view/src/content/xml/html_content/topic/Index.xml

    r18555 r19756  
    1616        <TITLE>North Dakota's Indicator-based Information System for Public Health (ND-IBIS) Topics</TITLE>
    1717
    18         <OTHER_HEAD_CONTENT>
    19                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    20         </OTHER_HEAD_CONTENT>
    2118
    2219        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/Introduction.xml

    r18288 r19756  
    55        <TITLE>Indicator-based Information System for Public Health (IBIS-PH) Topics</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/healthcare/access/availability/Detail.xml

    r18683 r19756  
    55        <TITLE>Availability of Health Care</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/healthcare/access/insurance/Detail.xml

    r18683 r19756  
    55        <TITLE>Health Care Coverage and Cost</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/healthcare/utilization/immunization/Detail.xml

    r18683 r19756  
    55        <TITLE>Immunization</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/healthcare/utilization/oral/Detail.xml

    r18683 r19756  
    55        <TITLE>Oral Health</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/healthcare/utilization/other/Detail.xml

    r18683 r19756  
    55        <TITLE>Other Clinical Preventive Services</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/healthcare/utilization/screening/cancer/Detail.xml

    r18683 r19756  
    55        <TITLE>Cancer Screening</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/healthcare/utilization/screening/cardiovascular/Detail.xml

    r18683 r19756  
    55        <TITLE>Cardiovascular Disease Screening</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/healthoutcome/cancer/Detail.xml

    r18683 r19756  
    55        <TITLE>Cancer</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/healthoutcome/death/Detail.xml

    r18683 r19756  
    55        <TITLE>Leading Causes of Death</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/healthoutcome/disease/chronic/Detail.xml

    r18683 r19756  
    55        <TITLE>Chronic Diseases</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/healthoutcome/disease/infectious/Detail.xml

    r18683 r19756  
    55        <TITLE>Infectious Disease</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/healthoutcome/injury/Detail.xml

    r18683 r19756  
    55        <TITLE>Injury and Violence</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/healthoutcome/mch/Detail.xml

    r18683 r19756  
    55        <TITLE>Maternal and Child Health</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/healthoutcome/measures/Detail.xml

    r18683 r19756  
    55        <TITLE>Summary Measures of Health Status</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/healthoutcome/mental/Detail.xml

    r18683 r19756  
    55        <TITLE>Mental Health</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/healthoutcome/substance/Detail.xml

    r18683 r19756  
    55        <TITLE>Substance Use</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/population/demographic/characteristics/Detail.xml

    r18683 r19756  
    55        <TITLE>Demographic Characteristics</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/population/socialdeterminant/community/Detail.xml

    r18683 r19756  
    55        <TITLE>Social and Community Context</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/population/socialdeterminant/economic/Detail.xml

    r18683 r19756  
    55        <TITLE>Economic Stability</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/population/socialdeterminant/education/Detail.xml

    r18683 r19756  
    55        <TITLE>Education</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/population/socialdeterminant/neighborhood/Detail.xml

    r18683 r19756  
    55        <TITLE>Neighborhood and Built Environment</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/risk_resiliency/behavior/activity/Detail.xml

    r18683 r19756  
    55        <TITLE>Physical Activity</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/risk_resiliency/behavior/alcohol/Detail.xml

    r18683 r19756  
    55        <TITLE>Alcohol Use</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/risk_resiliency/behavior/injury/Detail.xml

    r18683 r19756  
    55        <TITLE>Injury Prevention</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/risk_resiliency/behavior/nutrition/Detail.xml

    r18683 r19756  
    55        <TITLE>Nutrition</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/risk_resiliency/behavior/tobacco/Detail.xml

    r18683 r19756  
    55        <TITLE>Tobacco</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/risk_resiliency/behavior/weight/Detail.xml

    r18683 r19756  
    55        <TITLE>Overweight and Obesity</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/content/xml/html_content/topic/risk_resiliency/environment/physical/Detail.xml

    r18683 r19756  
    55        <TITLE>Physical Environment</TITLE>
    66
    7         <OTHER_HEAD_CONTENT>
    8                 <link rel="stylesheet" type="text/css" ibis:href="css/_topic.css"/>
    9         </OTHER_HEAD_CONTENT>
    107
    118        <CONTENT>

  • trunk/ibisph-view/src/main/webapp/META-INF/context.xml.txt

    r16030 r19756  
    11Context 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
     2but should also apply to other app containers.  This context file is provided
    33to document potential usage.  To use, make sure it is renamed to "context.xml".
    44Google "java webapp context.xml" for great info from a variety of sites.
    … …  
    1616(if the engine and host are named their default values) and is named the same
    1717as 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/...
     18this context file will be placed and renamed as:
     19"tomcat/conf/Catalina/localhost/ibisph-view-2.2.1.xml"
     20with the app being referenced as:
     21server:port/ibisph-view-2.2.1/...
    2122
    2223Also: for Tomcat, the Host element needs to have deployXML="true" which for
    … …  
    2829Put another way, the path attribute is pretty much ignored except for server.xml
    2930
    30 To make this the default app in Tomcat simply rename the app's dir to be ROOT
    31 or change the app's context path attribute  in server.xml to be "/". 
     31To make this the default app in Tomcat simply rename the app's deployed directory
     32to be ROOT or change the app's context path attribute  in server.xml to be "/". 
    3233
    3334Example:
    … …  
    5051Add this if you are using a db for file storage or user info (specified in
    5152the 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"/>
    5354
    5455IMPORTANT RESOURCE LINK NOTE:
    … …  
    7374
    7475<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"/>
    7577</Context>
    7678

  • trunk/ibisph-view/src/main/webapp/WEB-INF/web.xml

    r19700 r19756  
    1616        TC7 = Servlet 3.0
    1717        TC8 = Servlet 3.1
     18        TC9 = Servlet 4.0
    1819
    1920        View version 2.3 and prior contained configurations for server side charts.
    … …  
    2122        converted Agileblox SVG to a raster image.  Code was also started that used
    2223        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 that
    24         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.
    2526-->
    2627<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
    … …  
    211212
    212213                <!--
    213                         Default publishing URL mapping that even if direct publishing is
    214                         configured in the admin app does no harm as these URLs are never hit.
    215                 -->
    216                 <url-pattern>/publish/*</url-pattern>
    217 
    218                 <!--
    219214                        Below are static content mappings that should route to a simple
    220215                        file streaming controller.  This mechanism allows adopters that

  • trunk/ibisph-view/src/main/webapp/css/ExpandableContent.css

    r19718 r19756  
    5555        border-bottom:          1px solid #666;
    5656        border-right:           1px solid #666;
    57         border-radius:          var(--border-radius-button); 
     57        border-radius:          var(--button-border-radius); 
    5858}
    5959.ExpandableContent:hover  > .Control,

  • trunk/ibisph-view/src/main/webapp/css/ExpandableInputList.css

    r7787 r19756  
    1818 * Structure:
    1919 * ---------------------------------------
    20  * ul.ExpandableInputList
     20 * [ul].ExpandableInputList - main container
    2121 *              li
    2222 *                      input type="checkbox" id="xyz" class="Control"

  • trunk/ibisph-view/src/main/webapp/css/ExpandableList.css

    r19718 r19756  
    1616 * Structure:
    1717 * ---------------------------------------
    18  * ul.ExpandableList
     18 * [ul].ExpandableList - main container.
    1919 *              li
    20  *                      - if sub selections -
     20 *              - if sub selections -
    2121 *                      input type="checkbox" id="xyz"
    2222 *                      label for="xyz"
    … …  
    142142
    143143
    144 .ExpandableList.TriangleControl li > input + label
    145 {
    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) + label
    152 {
    153         background-image:       url("../image/icon/16/triangle_right-gray.png");
    154 }
    155 
    156144.ExpandableList.RightControl li > a,
    157145.ExpandableList.RightControl li > div,

  • trunk/ibisph-view/src/main/webapp/css/GridPanelList.css

    r19718 r19756  
    77 * ---------------------------------------
    88 *      nav
    9  *              ul.HorizontalMenu
    10  *                      li - tab
     9 *              [ul].HorizontalMenu
     10 *                      li - first tab
    1111 *                              div.Panel
    1212 *                                      div.Header
    … …  
    2020 *                                              div.Block
    2121 *                                      div.Footer
    22  *                      li.Sticky - second tab
     22 *                      li - second tab
    2323 *                              . . .
    2424 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/

  • trunk/ibisph-view/src/main/webapp/css/HorizontalMenu.css

    r19718 r19756  
    88 * Structure:
    99 * ---------------------------------------
    10  * ul.HorizontalMenu
    11  *       li id="xxxxMenu"
    12  *              [a, .Title, label]
     10 * [ul].HorizontalMenu
     11 *              li id="xxxxMenu"
     12 *                      [a, .Title, label]
    1313 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
    1414

  • trunk/ibisph-view/src/main/webapp/css/Popup.css

    r19718 r19756  
    7171        cursor:                         default;
    7272
    73         border-radius:          var(--border-radius-container); 
     73        border-radius:          var(--container-border-radius); 
    7474        box-shadow:                     2px 2px 5px 0px #333;
    7575        transition:         opacity 0.5s linear;
    … …  
    132132        font-weight:            normal;
    133133
    134         border-radius:          border-radius-container; 
     134        border-radius:          container-border-radius; 
    135135        box-shadow:                     inset 2px 2px 5px 0px #333;
    136136}

  • trunk/ibisph-view/src/main/webapp/css/SlideOutContent.css

    r19718 r19756  
    5353        border-bottom:          1px solid #666;
    5454        border-right:           1px solid #666;
    55         border-radius:          var(--border-radius-button); 
     55        border-radius:          var(--button-border-radius); 
    5656}
    5757.SlideOutContent:hover  > .Control,

  • trunk/ibisph-view/src/main/webapp/css/TabbedContent.css

    r19718 r19756  
    99 * Structure:
    1010 * ---------------------------------------
    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"
    1616 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
    1717

  • trunk/ibisph-view/src/main/webapp/css/VerticalMenu-Dropdown.css

    r19700 r19756  
    99 * Structure:
    1010 * ---------------------------------------
    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.
    1312 *              li
    1413 *                      a -or- div

  • trunk/ibisph-view/src/main/webapp/css/VerticalMenu-ExpandableList.css

    r19718 r19756  
    1414 * Structure:
    1515 * ---------------------------------------
    16  * div  - main container - no class - needed for elevator to be able to position.
    17  *      [h2]
    18  *      ul.VerticalMenu.ExpandableList [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
     16 * .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
    2525 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
    2626

  • trunk/ibisph-view/src/main/webapp/css/VerticalMenu-Popout.css

    r19700 r19756  
    77 * Structure:
    88 * ---------------------------------------
    9  * div - main container - no class - needed for elevator to be able to position.
    10  *   ul class="VerticalMenu VerticalPopoutList" - sub dropdown menu container
     9 * .VerticalMenu.VerticalPopoutList - main container - no class - needed for elevator to be able to position.
     10 *   ul - sub dropdown menu container
    1111 *              li
    1212 *                      a -or- div

  • trunk/ibisph-view/src/main/webapp/css/VerticalMenu.css

    r19718 r19756  
    77 * Structure:
    88 * ---------------------------------------
    9  * nav - main container.
    10  *      [hx]
    11  *      ul.VerticalMenu
     9 * .VerticalMenu - main container.
     10 *      h[x]
     11 *      ul
    1212 *              li
    13  *                      h3
     13 *                      h[x+1]
    1414 *                      ul
    1515 *                              li
    … …  
    1818.VerticalMenu
    1919{
    20         color:                          #003366;
    2120        padding:                        0 1px 0 0;
    2221        margin:                         0;
    2322        list-style-type:        none;
    2423}
     24
     25.VerticalMenu h2,
     26.VerticalMenu h3
     27{
     28        color:                          var(--background-color);
     29        background-color:       var(--heading-color);
     30}
     31
    2532
    2633.VerticalMenu li

  • trunk/ibisph-view/src/main/webapp/css/VerticalPopoutList.css

    r19718 r19756  
    55 * Structure:
    66 * ---------------------------------------
    7  * ul.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
     7 * [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
    1313~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
    1414
    15 ul.VerticalPopoutList,
    16 ul.VerticalPopoutList ul
     15.VerticalPopoutList
    1716{
    1817        width:                          150px;
    … …  
    3332}
    3433
    35 ul.VerticalPopoutList li
     34.VerticalPopoutList li
    3635{
    3736        position:                       relative;       /* allows sub menus absolute work relative to the menu item */
    … …  
    4342        box-shadow:                     inset 2px 0px 2px 0px #99ccff;
    4443}
    45 ul.VerticalPopoutList li:hover,
    46 ul.VerticalPopoutList li:active,
    47 ul.VerticalPopoutList li:focus
     44.VerticalPopoutList li:hover,
     45.VerticalPopoutList li:active,
     46.VerticalPopoutList li:focus
    4847{
    4948        background-color:       #114477;
    … …  
    5150}
    5251
    53 ul.VerticalPopoutList li > a,
    54 ul.VerticalPopoutList li > a:visited,
    55 ul.VerticalPopoutList li > div:first-child
     52.VerticalPopoutList li > a,
     53.VerticalPopoutList li > a:visited,
     54.VerticalPopoutList li > div:first-child
    5655{
    5756        display:                        block;
    … …  
    6261        background-color:       transparent;
    6362}
    64 ul.VerticalPopoutList li a:hover,
    65 ul.VerticalPopoutList li a:active,
    66 ul.VerticalPopoutList li a:focus
     63.VerticalPopoutList li a:hover,
     64.VerticalPopoutList li a:active,
     65.VerticalPopoutList li a:focus
    6766{
    6867        color:                          var(--color-hover);
    … …  
    8382*/
    8483
    85 ul.VerticalPopoutList li ul
     84.VerticalPopoutList li ul
    8685{
    8786        position:                       absolute;
    … …  
    9493        z-index:                        1;
    9594}
    96 ul.VerticalPopoutList li:hover  ul,
    97 ul.VerticalPopoutList li:active ul,
    98 ul.VerticalPopoutList li:focus  ul
     95.VerticalPopoutList li:hover  ul,
     96.VerticalPopoutList li:active ul,
     97.VerticalPopoutList li:focus  ul
    9998{
    10099        visibility:                     visible;
    … …  
    103102}
    104103
    105 ul.VerticalPopoutList li ul li
     104.VerticalPopoutList li ul li
    106105{
    107106        background-color:       #336699;
    108107        box-shadow:                     inset 2px 0px 2px 0px #6699cc;
    109108}
    110 ul.VerticalPopoutList li ul li:hover,
    111 ul.VerticalPopoutList li ul li:active,
    112 ul.VerticalPopoutList li ul li:focus
     109.VerticalPopoutList li ul li:hover,
     110.VerticalPopoutList li ul li:active,
     111.VerticalPopoutList li ul li:focus
    113112{
    114113        background-color:       #225588;
    … …  
    116115}
    117116
    118 ul.VerticalPopoutList li ul li a,
    119 ul.VerticalPopoutList li ul li a:visited,
    120 ul.VerticalPopoutList li ul li div:first-child
     117.VerticalPopoutList li ul li a,
     118.VerticalPopoutList li ul li a:visited,
     119.VerticalPopoutList li ul li div:first-child
    121120{
    122121        padding:                        7px 3px 7px 10px;

  • trunk/ibisph-view/src/main/webapp/css/_general.css

    r19742 r19756  
    88:root
    99{
     10        --color:                                        #282828;
     11        --background-color:                     #ffffff;
     12        --heading-color:                        #003366;
    1013        --color-hover:                          #ffcc66;
    1114        --background-color-hover:       #003366;
    12         --border-radius-button:         4px;
    13         --border-radius-container:      5px;
     15        --button-border-radius:         4px;
     16        --container-border-radius:      5px;
    1417}
    1518
    … …  
    2225        padding:                        0;
    2326        color:                          #282828;
     27        color:                          var(--color);
    2428
    2529        /* browser calculates object width to include padding and border, default=content-box */
    … …  
    5761        font-weight:            normal;
    5862        color:                          #003366;
     63        color:                          var(--heading-color);
    5964}
    6065h1
    … …  
    139144        padding-left:           0.4em;
    140145        padding-right:          0.4em;
    141         text-decoration:        underline;
    142146        color:                          #003366;
    143147        background-color:       transparent;    /* NN 4.x does better with general setter NOT specific one */
     148        text-decoration:        underline;
    144149}
    145150a:visited, a:visited * {color: #663399;}
    … …  
    150155        color:                          var(--color-hover);
    151156        background-color:       var(--background-color-hover);
    152         border-radius:          var(--border-radius-button);
     157        border-radius:          var(--button-border-radius);
    153158}
    154159
    … …  
    178183        margin-right:           6px;
    179184        padding-right:          4px;
     185
     186        color:                          #eee;
    180187        background-color:       #225588;
    181         color:                          #eee;
     188
    182189        text-align:                     center;
    183190        cursor:                         pointer;
    184191
    185192        border:                         solid 1px #777;
    186         border-radius:          var(--border-radius-button);
     193        border-radius:          var(--button-border-radius);
    187194        box-shadow:                     inset 1px 1px 2px #bbb;
    188195/*
    … …  
    196203        color:                                  var(--color-hover);
    197204        background-color:               #114477;
     205        background-color:               var(--background-color-hover);
    198206}
    199207button:active

  • trunk/ibisph-view/src/main/webapp/css/stylesheet.css

    r19705 r19756  
    1111@import url("_layout.css");
    1212@import url("_layout-header.css");
     13@import url("_layout-footer.css");
    1314
    1415/* major named class definitions */

  • trunk/ibisph-view/src/main/webapp/xslt/html/MenuSelectionsList.xslt

    r19705 r19756  
    119119                                                div class=Panel                 SELECTIONS/SELECTION/SELECTIONS
    120120                                                        div class=Block         SELECTIONS/SELECTION/SELECTIONS/SELECTION
     121                                                                [hx]
    121122                                                                ul                              SELECTIONS/SELECTION/SELECTIONS/SELECTION/SELECTIONS
    122123                                                                        li                      SELECTIONS/SELECTION/SELECTIONS/SELECTION/SELECTIONS/SELECTION
Note: See TracChangeset for help on using the changeset viewer.