[seam-commits] Seam SVN: r15141 - in branches/community/Seam_2_3/jboss-seam-gen/dist/view: layout and 2 other directories.

Author: manaRH Date: 2012-09-14 09:43:30 -0400 (Fri, 14 Sep 2012) New Revision: 15141 Added: branches/community/Seam_2_3/jboss-seam-gen/dist/view/resources/ branches/community/Seam_2_3/jboss-seam-gen/dist/view/resources/theme.css branches/community/Seam_2_3/jboss-seam-gen/dist/view/resources/theme.ecss branches/community/Seam_2_3/jboss-seam-gen/dist/view/resources/useradmin.css Removed: branches/community/Seam_2_3/jboss-seam-gen/dist/view/stylesheet/theme.css branches/community/Seam_2_3/jboss-seam-gen/dist/view/stylesheet/theme.ecss branches/community/Seam_2_3/jboss-seam-gen/dist/view/stylesheet/useradmin.css Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/view/layout/template.xhtml Log: JBSEAM-5039 fixed loading of css styles through h:outputStylesheet Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/view/layout/template.xhtml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/view/layout/template.xhtml 2012-09-14 13:43:17 UTC (rev 15140) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/view/layout/template.xhtml 2012-09-14 13:43:30 UTC (rev 15141) @@ -12,8 +12,8 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <title>@projectName@</title> <link rel="shortcut icon" href="#{request.contextPath}/favicon.ico"/> - <h:outputStylesheet name="/stylesheet/theme.ecss"/> - <h:outputStylesheet name="/stylesheet/theme.css"/> + <h:outputStylesheet name="theme.ecss"/> + <h:outputStylesheet name="theme.css"/> <ui:insert name="head"/> </h:head> <h:body> Copied: branches/community/Seam_2_3/jboss-seam-gen/dist/view/resources/theme.css (from rev 15140, branches/community/Seam_2_3/jboss-seam-gen/dist/view/stylesheet/theme.css) =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/view/resources/theme.css (rev 0) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/view/resources/theme.css 2012-09-14 13:43:30 UTC (rev 15141) @@ -0,0 +1,218 @@ +html { + overflow-y: scroll; +} + +body { + font-size: 12px; + margin: 0px; +} + +a img { + border: none; +} + +h1 { + font-size: 1.6em; + margin-top: 0; +} + +input[type=submit], input[type=button] { + font-size: 11px; + margin: 5px 5px 5px 0; + cursor: pointer; +} + +input[type=text], input[type=password], textarea { + font-size: 12px; + padding-left: 1px; +} + +select { + font-size: 13px; +} + +.tableControl, .actionButtons { + width: 100%; +} + +.tableControl a { + padding-left: 10px; +} + +.tableControl { + text-align: right; +} + +.footer { + text-align: center; + font-size: 11px; + margin-bottom: 10px; +} + +.rich-table { + width: 100%; +} + +.body { + padding: 30px; +} +.message { + padding: 5px; + list-style: none; + border: 0; + background: none; + padding: 0; + color: #000000; + margin: 5px 0 8px 0; + font-size: 12px; +} + +.message li { + background: no-repeat left center; + padding-top: 1px; + padding-left: 20px; + margin-left: 3px; +} + +.message li.infomsg { + background-image: url(../img/msginfo.png); +} + +.message li.errormsg { + background-image: url(../img/msgerror.png); +} + +.message li.warnmsg { + background-image: url(../img/msgwarn.png); +} + +.name { + vertical-align: top; + font-weight: bold; + width: 115px; + float: left; + padding: 5px; + margin-top: 3px; + clear: left; +} + +.value { + float: left; + padding: 5px; +} + +.error { + float: left; + padding: 5px; +} + +.errors { + color: #FF0000; + vertical-align: middle; +} + +img.errors { + padding-right: 5px; +} + +.errors input, .errors textarea, .errors select { + border: 1px solid red !important; +} + +.required { + color: #FF0000; + padding-left: 2px; +} + +.rich-stglpanel-body { + overflow: auto; +} + +/* the specificity here is necessary to override the defaults */ +/* +.rich-panel .rich-panel-header, +.rich-stglpanel .rich-stglpanel-header { + padding: 2px 3px; +}*/ + +.rich-panel input[type=submit], .rich-panel input[type=button], +.rich-tabpanel input[type=submit], .rich-tabpanel input[type=button] { + margin-bottom: 0; +} + +.tableControl input[type=submit], .tableControl input[type=button], .tableControl select { + margin: 5px 0 5px 5px; +} + +/* I don't know why this is necessary, but the select is off by a pixel on the top and is padding too much on the left */ +.tableControl select { + margin-left: 2px; + position: relative; + top: 1px; +} + +.actionButtons { + padding-left: 1px; +} + +.actionButtons select { + margin: 5px 5px 5px 0; + vertical-align: bottom; +} + +.rich-toolbar-item a { + text-decoration: none; +} + +.rich-toolbar-item a:hover, .rich-ddmenu-label-select { + text-decoration: underline; +} + +.rich-toolbar-item .rich-menu-item a:hover { + text-decoration: none; +} + +.rich-datalist { + list-style: square; + margin: 6px 0 1px 0; + padding-left: 18px; +} + +.rich-list-item { + padding-bottom: 4px; +} + +div.info { + font-size: 1.2em; +} + +ul.bullets { + list-style: square; +} + +ul.bullets li { + padding-bottom: 2px; +} + +td.action { + text-align: center; + width: 8em; + white-space: nowrap; +} + +td.action a { + padding-left: 1px; + padding-right: 1px; +} + +table.radio { + border: 0; +} + +table.radio td { + padding: 0 2px; +} + +table.radio input[type=radio] { + vertical-align: bottom; +} Copied: branches/community/Seam_2_3/jboss-seam-gen/dist/view/resources/theme.ecss (from rev 15140, branches/community/Seam_2_3/jboss-seam-gen/dist/view/stylesheet/theme.ecss) =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/view/resources/theme.ecss (rev 0) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/view/resources/theme.ecss 2012-09-14 13:43:30 UTC (rev 15141) @@ -0,0 +1,82 @@ +body{ + font-family:'#{richSkin.generalFamilyFont}'; + color:'#{richSkin.generalTextColor}'; +} +h1{ + font-family:'#{richSkin.generalFamilyFont}'; + color:'#{richSkin.tabDisabledTextColor}'; +} +a:active, a:link, a:visited{ + color:'#{richSkin.generalLinkColor}'; +} +a:hover{ + color:'#{richSkin.hoverLinkColor}'; +} +input[type=text], input[type=password], textarea, select{ + background-color:'#{richSkin.controlBackgroundColor}'; + color:'#{richSkin.controlTextColor}'; + background-position:left top; + background-repeat:repeat-x; + background-image:"url(#{resource['org.richfaces.renderkit.html.images.SliderFieldGradient']})"; + border:1px solid; + border-color:'#{richSkin.tableBorderColor}'; +} +select{ + background-color:transparent; + background-image:"url(#{resource['org.richfaces.renderkit.html.images.SliderFieldGradient']})"; +} +option{ + background-color:'#{richSkin.generalBackgroundColor}'; +} +select[multiple]{ + background-color:'#{richSkin.controlBackgroundColor}'; +} +select[multiple] option{ + background-color:transparent; +} +input[type=submit], input[type=button]{ + padding:1px 4px; + background-image:"url(#{resource['org.richfaces.renderkit.html.GradientA']})"; + border:1px solid; + border-color:'#{richSkin.headerBackgroundColor}'; + color:'#{richSkin.headerTextColor}'; + font-weight:bold; +} +input[type=submit][disabled], input[type=button][disabled]{ + opacity:0.33; +} +* html input[type=submit], * html input[type=button], *+html input[type=submit], *+html input[type=button]{ + border:0; + font-size:11px; +} +.rich-table-subheadercell{ + background-image:"url(#{resource['org.richfaces.renderkit.images.TabGradientB']})"; +} +.rich-toolbar a:link, .rich-toolbar a:visited, .rich-toolbar a:active, .rich-toolbar a:hover{ + color:'#{richSkin.headerTextColor}'; +} +.rich-toolbar a:hover{ + color:'#{richSkin.generalTextColor}'; +} +.rich-toolbar .rich-menu-item, .rich-toolbar .rich-menu-item a, .rich-toolbar .rich-menu-item a:hover, .rich-toolbar .rich-menu-item a:visited{ + color:'#{richSkin.generalTextColor}'; +} +.rich-table-subheadercell a:hover{ + color:'#{richSkin.calendarHolidaysTextColor}'; +} +input[type=text][class*=rich-combobox-button-icon]{ + background-image:"url(#{resource['org.richfaces.renderkit.html.images.ComboBoxArrowImage']})"; + background-color:transparent; +} +input[type=text][class~=rich-combobox-button-icon-disabled]{ + background-image:"url(#{resource['org.richfaces.renderkit.html.images.ComboBoxArrowImageDisable']})"; + background-color:transparent; +} +input[type=text][class*=rich-combobox-button-background]{ + background-image:"url(#{resource['org.richfaces.renderkit.html.images.SpinnerButtonGradient']})"; + background-color:'#{richSkin.tabBackgroundColor}'; +} +input[type=text][class~=rich-combobox-button-pressed-background]{ + background-image:"url(#{resource['org.richfaces.renderkit.html.images.ComboBoxButtonPressGradient']})"; + background-color:'#{richSkin.tabBackgroundColor}'; +} Copied: branches/community/Seam_2_3/jboss-seam-gen/dist/view/resources/useradmin.css (from rev 15140, branches/community/Seam_2_3/jboss-seam-gen/dist/view/stylesheet/useradmin.css) =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/view/resources/useradmin.css (rev 0) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/view/resources/useradmin.css 2012-09-14 13:43:30 UTC (rev 15141) @@ -0,0 +1,112 @@ +input.newuser { + background: url(../img/btnnewuser.png) top left no-repeat; + height: 39px; + width: 113px; + margin: 4px 4px 4px 4px; + border: 0px; + cursor: pointer; +} + +input.newrole { + background: url(../img/btnnewrole.png) top left no-repeat; + height: 39px; + width: 113px; + margin: 4px 4px 4px 4px; + border: 0px; + cursor: pointer; +} + +input.newpermission { + background: url(../img/btnnewpermission.png) top left no-repeat; + height: 39px; + width: 113px; + margin: 4px 4px 4px 4px; + border: 0px; + cursor: pointer; +} + +input.manageusers { + display: block; + background: url(../img/btnmanageusers.png) top left no-repeat; + height: 88px; + width: 300px; + padding-left: 10px; + font-size: 19px; + font-weight: bold; + color: #333333; + border: 0px; + cursor: pointer; + margin-top: 20px; + margin-left: 20px; +} + +input.manageroles { + display: block; + background: url(../img/btnmanageroles.png) top left no-repeat; + height: 88px; + width: 300px; + padding-left: 10px; + font-size: 19px; + font-weight: bold; + color: #333333; + border: 0px; + cursor: pointer; + margin-top: 20px; + margin-left: 20px; +} + +.roles { + width: 120px; + border: 1px solid #7F9DB9; + background-color: #E7EDF7; +} + +div.selectMany label { + float: none; +} + +div.selectMany input[type="checkbox"] { + vertical-align: middle; +} + +div.status-true { + background: url(../img/true.png) top left no-repeat; + width: 14px; + height: 15px; + margin-left: auto; + margin-right: auto; +} + +div.status-false { + background: url(../img/false.png) top left no-repeat; + width: 14px; + height: 15px; + margin-left: auto; + margin-right: auto; +} + +table.useradmin, div.useradmin { + width: 500px; +} + +/* +table.useradmin tr.odd { + background-color: #FFFFFF; +} + +table.useradmin tr.even { + background-color: #E9F5FF; +} +*/ + +td.enabled { + text-align: center; +} + +fieldset.roles .roles { + border: none; +} + +table.iceSelMnyCb td { + text-align: left; +} Deleted: branches/community/Seam_2_3/jboss-seam-gen/dist/view/stylesheet/theme.css =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/view/stylesheet/theme.css 2012-09-14 13:43:17 UTC (rev 15140) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/view/stylesheet/theme.css 2012-09-14 13:43:30 UTC (rev 15141) @@ -1,218 +0,0 @@ -html { - overflow-y: scroll; -} - -body { - font-size: 12px; - margin: 0px; -} - -a img { - border: none; -} - -h1 { - font-size: 1.6em; - margin-top: 0; -} - -input[type=submit], input[type=button] { - font-size: 11px; - margin: 5px 5px 5px 0; - cursor: pointer; -} - -input[type=text], input[type=password], textarea { - font-size: 12px; - padding-left: 1px; -} - -select { - font-size: 13px; -} - -.tableControl, .actionButtons { - width: 100%; -} - -.tableControl a { - padding-left: 10px; -} - -.tableControl { - text-align: right; -} - -.footer { - text-align: center; - font-size: 11px; - margin-bottom: 10px; -} - -.rich-table { - width: 100%; -} - -.body { - padding: 30px; -} -.message { - padding: 5px; - list-style: none; - border: 0; - background: none; - padding: 0; - color: #000000; - margin: 5px 0 8px 0; - font-size: 12px; -} - -.message li { - background: no-repeat left center; - padding-top: 1px; - padding-left: 20px; - margin-left: 3px; -} - -.message li.infomsg { - background-image: url(../img/msginfo.png); -} - -.message li.errormsg { - background-image: url(../img/msgerror.png); -} - -.message li.warnmsg { - background-image: url(../img/msgwarn.png); -} - -.name { - vertical-align: top; - font-weight: bold; - width: 115px; - float: left; - padding: 5px; - margin-top: 3px; - clear: left; -} - -.value { - float: left; - padding: 5px; -} - -.error { - float: left; - padding: 5px; -} - -.errors { - color: #FF0000; - vertical-align: middle; -} - -img.errors { - padding-right: 5px; -} - -.errors input, .errors textarea, .errors select { - border: 1px solid red !important; -} - -.required { - color: #FF0000; - padding-left: 2px; -} - -.rich-stglpanel-body { - overflow: auto; -} - -/* the specificity here is necessary to override the defaults */ -/* -.rich-panel .rich-panel-header, -.rich-stglpanel .rich-stglpanel-header { - padding: 2px 3px; -}*/ - -.rich-panel input[type=submit], .rich-panel input[type=button], -.rich-tabpanel input[type=submit], .rich-tabpanel input[type=button] { - margin-bottom: 0; -} - -.tableControl input[type=submit], .tableControl input[type=button], .tableControl select { - margin: 5px 0 5px 5px; -} - -/* I don't know why this is necessary, but the select is off by a pixel on the top and is padding too much on the left */ -.tableControl select { - margin-left: 2px; - position: relative; - top: 1px; -} - -.actionButtons { - padding-left: 1px; -} - -.actionButtons select { - margin: 5px 5px 5px 0; - vertical-align: bottom; -} - -.rich-toolbar-item a { - text-decoration: none; -} - -.rich-toolbar-item a:hover, .rich-ddmenu-label-select { - text-decoration: underline; -} - -.rich-toolbar-item .rich-menu-item a:hover { - text-decoration: none; -} - -.rich-datalist { - list-style: square; - margin: 6px 0 1px 0; - padding-left: 18px; -} - -.rich-list-item { - padding-bottom: 4px; -} - -div.info { - font-size: 1.2em; -} - -ul.bullets { - list-style: square; -} - -ul.bullets li { - padding-bottom: 2px; -} - -td.action { - text-align: center; - width: 8em; - white-space: nowrap; -} - -td.action a { - padding-left: 1px; - padding-right: 1px; -} - -table.radio { - border: 0; -} - -table.radio td { - padding: 0 2px; -} - -table.radio input[type=radio] { - vertical-align: bottom; -} Deleted: branches/community/Seam_2_3/jboss-seam-gen/dist/view/stylesheet/theme.ecss =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/view/stylesheet/theme.ecss 2012-09-14 13:43:17 UTC (rev 15140) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/view/stylesheet/theme.ecss 2012-09-14 13:43:30 UTC (rev 15141) @@ -1,82 +0,0 @@ -body{ - font-family:'#{richSkin.generalFamilyFont}'; - color:'#{richSkin.generalTextColor}'; -} -h1{ - font-family:'#{richSkin.generalFamilyFont}'; - color:'#{richSkin.tabDisabledTextColor}'; -} -a:active, a:link, a:visited{ - color:'#{richSkin.generalLinkColor}'; -} -a:hover{ - color:'#{richSkin.hoverLinkColor}'; -} -input[type=text], input[type=password], textarea, select{ - background-color:'#{richSkin.controlBackgroundColor}'; - color:'#{richSkin.controlTextColor}'; - background-position:left top; - background-repeat:repeat-x; - background-image:"url(#{resource['org.richfaces.renderkit.html.images.SliderFieldGradient']})"; - border:1px solid; - border-color:'#{richSkin.tableBorderColor}'; -} -select{ - background-color:transparent; - background-image:"url(#{resource['org.richfaces.renderkit.html.images.SliderFieldGradient']})"; -} -option{ - background-color:'#{richSkin.generalBackgroundColor}'; -} -select[multiple]{ - background-color:'#{richSkin.controlBackgroundColor}'; -} -select[multiple] option{ - background-color:transparent; -} -input[type=submit], input[type=button]{ - padding:1px 4px; - background-image:"url(#{resource['org.richfaces.renderkit.html.GradientA']})"; - border:1px solid; - border-color:'#{richSkin.headerBackgroundColor}'; - color:'#{richSkin.headerTextColor}'; - font-weight:bold; -} -input[type=submit][disabled], input[type=button][disabled]{ - opacity:0.33; -} -* html input[type=submit], * html input[type=button], *+html input[type=submit], *+html input[type=button]{ - border:0; - font-size:11px; -} -.rich-table-subheadercell{ - background-image:"url(#{resource['org.richfaces.renderkit.images.TabGradientB']})"; -} -.rich-toolbar a:link, .rich-toolbar a:visited, .rich-toolbar a:active, .rich-toolbar a:hover{ - color:'#{richSkin.headerTextColor}'; -} -.rich-toolbar a:hover{ - color:'#{richSkin.generalTextColor}'; -} -.rich-toolbar .rich-menu-item, .rich-toolbar .rich-menu-item a, .rich-toolbar .rich-menu-item a:hover, .rich-toolbar .rich-menu-item a:visited{ - color:'#{richSkin.generalTextColor}'; -} -.rich-table-subheadercell a:hover{ - color:'#{richSkin.calendarHolidaysTextColor}'; -} -input[type=text][class*=rich-combobox-button-icon]{ - background-image:"url(#{resource['org.richfaces.renderkit.html.images.ComboBoxArrowImage']})"; - background-color:transparent; -} -input[type=text][class~=rich-combobox-button-icon-disabled]{ - background-image:"url(#{resource['org.richfaces.renderkit.html.images.ComboBoxArrowImageDisable']})"; - background-color:transparent; -} -input[type=text][class*=rich-combobox-button-background]{ - background-image:"url(#{resource['org.richfaces.renderkit.html.images.SpinnerButtonGradient']})"; - background-color:'#{richSkin.tabBackgroundColor}'; -} -input[type=text][class~=rich-combobox-button-pressed-background]{ - background-image:"url(#{resource['org.richfaces.renderkit.html.images.ComboBoxButtonPressGradient']})"; - background-color:'#{richSkin.tabBackgroundColor}'; -} Deleted: branches/community/Seam_2_3/jboss-seam-gen/dist/view/stylesheet/useradmin.css =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/view/stylesheet/useradmin.css 2012-09-14 13:43:17 UTC (rev 15140) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/view/stylesheet/useradmin.css 2012-09-14 13:43:30 UTC (rev 15141) @@ -1,112 +0,0 @@ -input.newuser { - background: url(../img/btnnewuser.png) top left no-repeat; - height: 39px; - width: 113px; - margin: 4px 4px 4px 4px; - border: 0px; - cursor: pointer; -} - -input.newrole { - background: url(../img/btnnewrole.png) top left no-repeat; - height: 39px; - width: 113px; - margin: 4px 4px 4px 4px; - border: 0px; - cursor: pointer; -} - -input.newpermission { - background: url(../img/btnnewpermission.png) top left no-repeat; - height: 39px; - width: 113px; - margin: 4px 4px 4px 4px; - border: 0px; - cursor: pointer; -} - -input.manageusers { - display: block; - background: url(../img/btnmanageusers.png) top left no-repeat; - height: 88px; - width: 300px; - padding-left: 10px; - font-size: 19px; - font-weight: bold; - color: #333333; - border: 0px; - cursor: pointer; - margin-top: 20px; - margin-left: 20px; -} - -input.manageroles { - display: block; - background: url(../img/btnmanageroles.png) top left no-repeat; - height: 88px; - width: 300px; - padding-left: 10px; - font-size: 19px; - font-weight: bold; - color: #333333; - border: 0px; - cursor: pointer; - margin-top: 20px; - margin-left: 20px; -} - -.roles { - width: 120px; - border: 1px solid #7F9DB9; - background-color: #E7EDF7; -} - -div.selectMany label { - float: none; -} - -div.selectMany input[type="checkbox"] { - vertical-align: middle; -} - -div.status-true { - background: url(../img/true.png) top left no-repeat; - width: 14px; - height: 15px; - margin-left: auto; - margin-right: auto; -} - -div.status-false { - background: url(../img/false.png) top left no-repeat; - width: 14px; - height: 15px; - margin-left: auto; - margin-right: auto; -} - -table.useradmin, div.useradmin { - width: 500px; -} - -/* -table.useradmin tr.odd { - background-color: #FFFFFF; -} - -table.useradmin tr.even { - background-color: #E9F5FF; -} -*/ - -td.enabled { - text-align: center; -} - -fieldset.roles .roles { - border: none; -} - -table.iceSelMnyCb td { - text-align: left; -}