Author: jfthomps
Date: Mon May 7 16:51:38 2012
New Revision: 1335119
URL: http://svn.apache.org/viewvc?rev=1335119&view=rev
Log:
made changes to work with Dojo Toolkit 1.6. There was a problem with IE and
dijit.dialog where the background would become opaque instead of grayed. This
was fixed by changing the DOCTYPE to just 'html'. However, that resulted in
some layout issues that needed to be fixed with some CSS changes.
Modified:
incubator/vcl/trunk/web/themes/copydojocss.sh
incubator/vcl/trunk/web/themes/default/css/vcl.css
incubator/vcl/trunk/web/themes/default/page.php
Modified: incubator/vcl/trunk/web/themes/copydojocss.sh
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/themes/copydojocss.sh?rev=1335119&r1=1335118&r2=1335119&view=diff
==============================================================================
--- incubator/vcl/trunk/web/themes/copydojocss.sh (original)
+++ incubator/vcl/trunk/web/themes/copydojocss.sh Mon May 7 16:51:38 2012
@@ -60,7 +60,13 @@ if [[ -r tundra_rtl.css.commented.css ]]
mv tundra_rtl.css.commented.css ${skin}_rtl.css.commented.css
fi
-for f in $(grep -l '\.tundra' *.css); do
+if [[ -r ${skin}_rtl.css ]] && grep -q tundra_rtl.css ${skin}.css; then
+ sed -i "s/tundra_rtl/${skin}_rtl/" ${skin}.css
+ sed -i "s|\.\./dijit_rtl|../../../../dojo/dijit/themes/dijit_rtl|"
${skin}_rtl.css
+ sed -i
"s|\.\./\.\./icons/editorIcons_rtl|../../../../dojo/dijit/icons/editorIcons_rtl|"
${skin}_rtl.css
+fi
+
+for f in $(grep -l '\.tundra' *.css layout/*.css form/*.css); do
if ! sed -i "s/\.tundra/\.$skin/g" $f; then
echo failed to change string \"tundra\" to \"$skin\" in
$path/$skin/css/dojo/$f
echo remove $path/$skin/css/dojo before retrying
@@ -74,5 +80,15 @@ if ! sed -i "s/\.\.\/dijit.css/..\/..\/.
echo remove $path/$skin/css/dojo before retrying
exit 6
fi
+if ! sed -i
"s|\.\./\.\./icons/commonIcons|../../../../dojo/dijit/icons/commonIcons|"
$skin.css; then
+ echo failed to change path to commonIcons.css in
$path/$skin/css/dojo/$skin.css
+ echo remove $path/$skin/css/dojo before retrying
+ exit 7
+fi
+if ! sed -i
"s|\.\./\.\./icons/editorIcons|../../../../dojo/dijit/icons/editorIcons|"
$skin.css; then
+ echo failed to change path to commonIcons.css in
$path/$skin/css/dojo/$skin.css
+ echo remove $path/$skin/css/dojo before retrying
+ exit 7
+fi
echo Successfully copied dojo css to $skin
Modified: incubator/vcl/trunk/web/themes/default/css/vcl.css
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/themes/default/css/vcl.css?rev=1335119&r1=1335118&r2=1335119&view=diff
==============================================================================
--- incubator/vcl/trunk/web/themes/default/css/vcl.css (original)
+++ incubator/vcl/trunk/web/themes/default/css/vcl.css Mon May 7 16:51:38 2012
@@ -74,6 +74,95 @@ form {
margin-bottom: 0;
}
+.themelayouttable {
+ border-collapse: collapse;
+}
+
+.themelayouttable td.nopadding {
+ padding: 0;
+}
+
+.themeheadertable {
+ border-collapse: collapse;
+}
+
+.themelayoutsidespacer {
+ padding: 0 40px 0 40px;
+}
+
+.themelayoutsidetrim {
+ padding: 0 3px 0 3px;
+ background: url(../images/background_L.png) repeat-y;
+}
+
+.themelayoutsidetrim2 {
+ padding: 0 3px 0 4px;
+ background: url(../images/background_gradient.gif) repeat-y;
+}
+
+.themelayoutsidetrim3 {
+ padding: 0 3px 0 3px;
+ background: url(../images/background_R.png) repeat-y;
+}
+
+.themelayoutsidetrim4 {
+ padding: 0 0 0 1px;
+ background: url(../images/black.jpg) repeat-y;
+}
+
+.themelayoutsidetrim5 {
+ padding: 0 0 0 3px;
+ background: url(../images/content_border_R.jpg) repeat-y;
+}
+
+.themelayoutbannercenter {
+ padding: 0;
+ background: url(../images/vclbanner_C.jpg) repeat-x;
+ width: 100%;
+}
+
+.themelayoutcentercell {
+ padding: 0;
+ width: 100%;
+ background: url(../images/background_gradient.gif);
+}
+
+.themelayouttopseparator {
+ margin: 0;
+ padding: 23px 0 0 0;
+ width: 100%;
+ background: url(../images/bar_bg.jpg);
+}
+
+.themelayouttable td.thememenu {
+ width: 160px;
+ background: url(../images/menu_bg.jpg) repeat-y;
+ border-spacing: 0;
+ padding: 0 1px 0 0;
+}
+
+.themelayouttable td.themecontent {
+ width: 100%;
+ text-align: left;
+ background-color: white;
+ padding: 0;
+}
+
+.themebottomleft {
+ background: url(../images/background_bottom_L.jpg) repeat-x;
+ padding: 0;
+}
+
+.themebottomcenter {
+ background: url(../images/background_bottom_C.jpg) repeat-x;
+ padding: 3px 0 0 0;
+}
+
+.themebottomright {
+ background: url(../images/background_bottom_R.jpg) no-repeat;
+ padding: 0;
+}
+
#container {
background: #E5E5E5 url(../images/background.gif) repeat-y center;
display: block;
Modified: incubator/vcl/trunk/web/themes/default/page.php
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/themes/default/page.php?rev=1335119&r1=1335118&r2=1335119&view=diff
==============================================================================
--- incubator/vcl/trunk/web/themes/default/page.php (original)
+++ incubator/vcl/trunk/web/themes/default/page.php Mon May 7 16:51:38 2012
@@ -29,7 +29,8 @@
////////////////////////////////////////////////////////////////////////////////
function getHeader($refresh) {
global $user, $mode, $authed, $locale;
- $rt = "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01
Transitional//EN\">\n";
+ #$rt = "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01
Frameset//EN\">\n";
+ $rt = "<!DOCTYPE html>\n";
$rt .= "<html lang=\"$locale\">\n";
$rt .= "<head>\n";
$usenls = 0;
@@ -58,31 +59,33 @@ function getHeader($refresh) {
$rt .= "</head>\n\n";
$rt .= "<body class=default>\n\n";
$rt .= "<a class=hidden href=\"#content\" accesskey=2>Skip to
content</a>\n";
- $rt .= "<table border=0 cellpadding=0 cellspacing=0 summary=\"\">\n";
+ $rt .= "<table class=\"themelayouttable\" summary=\"\">\n";
$rt .= " <TR>\n";
- $rt .= " <TD width=80px nowrap></TD>\n";
- $rt .= " <TD width=6px
background=\"themes/default/images/background_L.png\" nowrap></TD>\n";
- $rt .= " <TD width=8px
background=\"themes/default/images/background_gradient.gif\" nowrap></TD>\n";
- $rt .= " <TD
background=\"themes/default/images/background_gradient.gif\" width=\"100%\">\n";
- $rt .= " <table border=0 cellpadding=0 cellspacing=0 width=\"100%\"
summary=\"\">\n";
- $rt .= " <TR>\n";
- $rt .= " <TD width=1px
background=\"themes/default/images/black.jpg\" nowrap></TD>\n";
- $rt .= " <TD width=215px nowrap><img
src=\"themes/default/images/vclbanner_L.jpg\" alt=\"\"></TD>\n";
- $rt .= " <TD
background=\"themes/default/images/vclbanner_C.jpg\" width=\"100%\">\n";
- $rt .= getSelectLanguagePulldown();
+ $rt .= " <TD class=\"themelayoutsidespacer\"></TD>\n";
+ $rt .= " <TD class=\"themelayoutsidetrim\"></TD>\n";
+ $rt .= " <TD class=\"themelayoutsidetrim2\"></TD>\n";
+ $rt .= " <TD class=\"themelayoutcentercell\">\n";
+ $rt .= " <table class=\"themeheadertable\" summary=\"\">\n";
+ $rt .= " <TR style=\"background-color: white;\">\n";
+ $rt .= " <TD class=\"themelayoutsidetrim4\"></TD>\n";
+ $rt .= " <TD class=\"nopadding\"><img
src=\"themes/default/images/vclbanner_L.jpg\" alt=\"\"></TD>\n";
+ $rt .= " <TD class=\"themelayoutbannercenter\">\n";
+ if($mode != 'inmaintenance')
+ $rt .= getSelectLanguagePulldown();
$rt .= " </TD>\n";
- $rt .= " <TD width=198px nowrap><img
src=\"themes/default/images/vclbanner_R.jpg\" alt=\"\"></TD>\n";
- $rt .= " <TD width=3px
background=\"themes/default/images/content_border_R.jpg\" nowrap></TD>\n";
+ $rt .= " <TD class=\"nopadding\"><img
src=\"themes/default/images/vclbanner_R.jpg\" alt=\"\"></TD>\n";
+ $rt .= " <TD class=\"themelayoutsidetrim5\"></TD>\n";
$rt .= " </TR>\n";
$rt .= " <TR>\n";
- $rt .= " <TD width=1px
background=\"themes/default/images/black.jpg\" nowrap></TD>\n";
- $rt .= " <TD background=\"themes/default/images/bar_bg.jpg\"
width=\"100%\" colspan=3 height=23px></TD>\n";
- $rt .= " <TD width=3px
background=\"themes/default/images/content_border_R.jpg\" nowrap></TD>\n";
+ $rt .= " <TD class=\"themelayoutsidetrim4\"></TD>\n";
+ $rt .= " <TD class=\"themelayouttopseparator\"
colspan=3></TD>\n";
+ $rt .= " <TD class=\"themelayoutsidetrim5\"></TD>\n";
$rt .= " </TR>\n";
$rt .= " </table>\n";
- $rt .= " <table border=0 cellpadding=0 cellspacing=0 width=\"100%\"
summary=\"\">\n";
+
+ $rt .= " <table class=\"themelayouttable\" summary=\"\">\n";
$rt .= " <TR valign=top>\n";
- $rt .= " <TD width=160px
background=\"themes/default/images/menu_bg.jpg\" nowrap>\n";
+ $rt .= " <TD class=\"thememenu\">\n";
$rt .= "<div id=menulist>\n";
$rt .= "<h3 class=hidden>Resources</h3>\n";
$rt .= "<ul>\n";
@@ -95,7 +98,7 @@ function getHeader($refresh) {
$rt .= "<img
src=\"themes/default/images/menu_dividerblock.jpg\" border=0 width=158
height=83 alt=\"\"><br/>\n";
$rt .= "</div>\n";
$rt .= " </TD>\n";
- $rt .= " <TD width=\"100%\" style=\"align: left; background:
#ffffff;\">\n";
+ $rt .= " <TD class=\"themecontent\">\n";
$rt .= "<div id=content>\n";
return $rt;
}
@@ -113,12 +116,12 @@ function getFooter() {
$year = date("Y");
$rt = "</div>\n";
$rt .= " </TD>\n";
- $rt .= " <TD width=3px
background=\"themes/default/images/content_border_R.jpg\" nowrap></TD>\n";
+ $rt .= " <TD class=\"themelayoutsidetrim5\"></TD>\n";
$rt .= " </TR>\n";
$rt .= " <TR>\n";
- $rt .= " <TD width=160px nowrap><img
src=\"themes/default/images/background_bottom_L.jpg\" alt=\"\"></TD>\n";
- $rt .= " <TD
background=\"themes/default/images/background_bottom_C.jpg\"
width=\"100%\"></TD>\n";
- $rt .= " <TD width=3px nowrap><img
src=\"themes/default/images/background_bottom_R.jpg\" alt=\"\"></TD>\n";
+ $rt .= " <TD class=\"themebottomleft\"></TD>\n";
+ $rt .= " <TD class=\"themebottomcenter\"></TD>\n";
+ $rt .= " <TD class=\"themebottomright\"></TD>\n";
$rt .= " </TR>\n";
$rt .= " </table>\n";
$rt .= "<div id=\"footer\">\n";
@@ -128,11 +131,10 @@ function getFooter() {
$rt .= "</p>\n";
$rt .= "</div>\n";
$rt .= "</div>\n";
- $rt .= "<!-- end footer -->\n";
$rt .= "</TD>\n";
- $rt .= "<TD width=8px
background=\"themes/default/images/background_gradient.gif\" nowrap></TD>\n";
- $rt .= "<TD width=6px
background=\"themes/default/images/background_R.png\" nowrap></TD>\n";
- $rt .= "<TD width=80px nowrap></TD>\n";
+ $rt .= "<TD class=\"themelayoutsidetrim2\"></TD>\n";
+ $rt .= "<TD class=\"themelayoutsidetrim3\"></TD>\n";
+ $rt .= "<TD class=\"themelayoutsidespacer\"></TD>\n";
$rt .= "</TR>\n";
$rt .= "</table>\n";
$rt .= "</body>\n";
