nativea: SDK rebanding, change css for generated docu

6 files changed, 43 insertions, 44 deletions

diff --git a/odk/docs/common/ref/idl.css b/odk/docs/common/ref/idl.css
index 3fdb1a07a00c..6327b9243f80 100644
--- a/odk/docs/common/ref/idl.css
+++ b/odk/docs/common/ref/idl.css
@@ -6,9 +6,9 @@
 body { background-color:#ffffff; }
 
 #adc-idlref a { text-decoration: none; }
-#adc-idlref a:link { color: #C44B01; }
+#adc-idlref a:link { color: #0e85cd; }
 #adc-idlref a:visited { color: #638093; }
-#adc-idlref a:active { color: #9DCA12; }
+#adc-idlref a:active { color: #4dadea; }
 
 #adc-idlref h3
 	    { font-size:13pt; font-weight:bold;
@@ -26,13 +26,13 @@ body { background-color:#ffffff; }
 #adc-idlref td.title
 	    { font-family: Arial; font-size:19pt; font-weight:bold;
 	      line-height:30pt;
-	      background-image:url(../../images/bg_table.gif);
+	      background-image:url(../../images/bg_table.png);
 	      text-align:center; }
 
 #adc-idlref td.subtitle
 	    { font-family: Arial; font-size:13pt;
 	      line-height:20pt;
-	      background-image:url(../../images/bg_table.gif); }
+	      background-image:url(../../images/bg_table.png); }
 
 #adc-idlref td.crosstitle
 	    { font-size:12pt; font-weight:bold;
@@ -40,15 +40,15 @@ body { background-color:#ffffff; }
 
 #adc-idlref td.imdetail
 	    { width:100%;
-	      background-image:url(../../images/bg_table3.gif); }
+	      background-image:url(../../images/bg_table3.png); }
 
 #adc-idlref td.imsum_left  { width:30%;  }
 #adc-idlref td.imsum_right { width:70%;  }
 
-#adc-idlref table.navimain { background-image:url(../../images/bg_table2.gif); }
+#adc-idlref table.navimain { background-image:url(../../images/bg_table2.png); }
 
 #adc-idlref td.navimain
-	    { background-image:url(../../images/bg_table2.gif);
+	    { background-image:url(../../images/bg_table2.png);
 	      text-align:center;
 	      font-family: Arial; font-size:12pt; font-weight:bold;
 	      padding-left:7pt; padding-right:7pt; }
@@ -79,13 +79,12 @@ body { background-color:#ffffff; }
 
 #adc-idlref a.membertitle  { font-size:12pt; font-weight:bold; line-height:18pt; }
 
-#adc-idlref a:link.navimain, #adc-idlref a:link.navisub  { color:#C44B01; }
+#adc-idlref a:link.navimain, #adc-idlref a:link.navisub  { color:#0e85cd; }
 #adc-idlref a:visited.navimain, #adc-idlref a:visited.navisub { color: #638093; }
-#adc-idlref a:active.navimain, #adc-idlref a:active.navisub { color: #9DCA12; }
+#adc-idlref a:active.navimain, #adc-idlref a:active.navisub { color: #4dadea; }
 
 #adc-idlref .dt            { font-weight:bold; }
-#adc-idlref .namechain     { font-size:13pt; font-weight:bold;
-                 margin-top:3pt; margin-bottom:6pt; }
+#adc-idlref .namechain     { font-size:13pt; font-weight:bold; margin-top:3pt; margin-bottom:6pt; }
 #adc-idlref .title2        { font-size:13pt; font-style:italic; font-weight:bold; text-align:left; }
 
 #adc-idlref table { empty-cells:show; }
diff --git a/odk/docs/cpp/ref/cpp.css b/odk/docs/cpp/ref/cpp.css
index d657b2b17244..b8286999bf19 100755..100644
--- a/odk/docs/cpp/ref/cpp.css
+++ b/odk/docs/cpp/ref/cpp.css
@@ -4,9 +4,9 @@
 body   { background-color:#ffffff; }
 
 #adc-cppref a { text-decoration: none; }
-#adc-cppref a:link { color: #C44B01; }
+#adc-cppref a:link { color: #0e85cd; }
 #adc-cppref a:visited { color: #638093; }
-#adc-cppref a:active { color: #9DCA12; }
+#adc-cppref a:active { color: #4dadea; }
 
 #adc-cppref h1     { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }
 #adc-cppref h2     { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }
@@ -14,7 +14,7 @@ body   { background-color:#ffffff; }
 #adc-cppref h4     { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }
 #adc-cppref dl     { margin-top:1pt; margin-bottom:1pt; }
 #adc-cppref dl.member  { margin-top:1pt; margin-bottom:1pt; 
-	     background-image:url(../../images/bg_table3.gif); }
+	     background-image:url(../../images/bg_table3.png); }
 #adc-cppref dt     { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }
 #adc-cppref dt.member  { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }
 #adc-cppref dt.simple  { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; }
@@ -25,43 +25,43 @@ body   { background-color:#ffffff; }
 #adc-cppref tr     { font-size:10pt; }
 #adc-cppref td     { font-size:10pt; }
 
-#adc-cppref dt.attention   { color:#dd0000; }
+#adc-cppref dt.attention   { color:#ff0000; }
 
 #adc-cppref div.title      { text-align:center;  line-height:26pt; 
-		 background-image:url(../../images/bg_table.gif); }
-#adc-cppref .subtitle      { background-image:url(../../images/bg_table.gif); }
+		 background-image:url(../../images/bg_table.png); }
+#adc-cppref .subtitle      { background-image:url(../../images/bg_table.png); }
 
-#adc-cppref td.flagname    { background-image:url(../../images/bg_table2.gif);
+#adc-cppref td.flagname    { background-image:url(../../images/bg_table2.png);
 	         font-family:Arial; font-size:8pt; font-weight:bold; }
 #adc-cppref td.flagyes     { font-family:Arial; font-size:8pt; font-weight:bold; }
 #adc-cppref td.flagno      { font-family:Arial; font-size:8pt; }
 #adc-cppref td.flagtext    { font-family:Arial; font-size:8pt; font-weight:bold; }
 
 #adc-cppref td.navimain, td.navimain a
-               { background-image:url(../../images/bg_table2.gif);
+               { background-image:url(../../images/bg_table2.png);
                  font-family:Arial; font-size:12pt; font-weight:bold; }
 
 /* background-color:#eeeeff; color:#000000; */
 
 #adc-cppref td.navimainself
-               { background-color:#2222ad; color:#ffffff;
+               { background-color:#226bb0; color:#ffffff;
                  font-family:Arial; font-size:12pt; font-weight:bold; }
 #adc-cppref td.navimainnone
-               { background-image:url(../../images/bg_table2.gif);
+               { background-image:url(../../images/bg_table2.png);
                  font-family:Arial; font-size:12pt; }
 
-#adc-cppref div.define     { font-family:Arial; background-color:#ccccff; }
+#adc-cppref div.define     { font-family:Arial; background-color:#87c2e6; }
 
 #adc-cppref .nqclass       { color:#008800; }
 
-#adc-cppref h3.help        { background-color:#eeeeff; margin-top:12pt; }
+#adc-cppref h3.help        { background-color:#cfe7f5; margin-top:12pt; }
 
-#adc-cppref .btpubl        { color:#33ff33; }
-#adc-cppref .btprot        { color:#cc9933; }
-#adc-cppref .btpriv        { color:#ff6666; }
-#adc-cppref .btvpubl       { color:#33ff33; font-style:italic; }
-#adc-cppref .btvprot       { color:#cc9933; font-style:italic; }
-#adc-cppref .btvpriv       { color:#ff6666; font-style:italic; }
+#adc-cppref .btpubl        { color:#87c2e6; }
+#adc-cppref .btprot        { color:#226bb0; }
+#adc-cppref .btpriv        { color:#06348c; }
+#adc-cppref .btvpubl       { color:#87c2e6; font-style:italic; }
+#adc-cppref .btvprot       { color:#226bb0; font-style:italic; }
+#adc-cppref .btvpriv       { color:#06348c; font-style:italic; }
 #adc-cppref .btself        { font-weight:bold; }
 
 #adc-cppref table { empty-cells:show; }
diff --git a/odk/docs/images/bg_table2.png b/odk/docs/images/bg_table2.png
new file mode 100644
index 000000000000..d0cafddfecaa
--- /dev/null
+++ b/odk/docs/images/bg_table2.png
diff --git a/odk/docs/images/bg_table3.png b/odk/docs/images/bg_table3.png
new file mode 100644
index 000000000000..2759066df928
--- /dev/null
+++ b/odk/docs/images/bg_table3.png
diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk
index 3d73d4d1b63f..f934720006ce 100644
--- a/odk/pack/copying/makefile.mk
+++ b/odk/pack/copying/makefile.mk
@@ -136,21 +136,21 @@ DOCUFILES= \
     $(DESTDIRDOCUIMAGES)/nada.gif \
     $(DESTDIRDOCUIMAGES)/arrow-2.gif \
     $(DESTDIRDOCUIMAGES)/bluball.gif \
-    $(DESTDIRDOCUIMAGES)/so-main-app_32.png \
+    $(DESTDIRDOCUIMAGES)/orc-main-app_32.png \
     $(DESTDIRDOCUIMAGES)/ooo-main-app_32.png \
+    $(DESTDIRDOCUIMAGES)/odk-footer-logo.png \
     $(DESTDIRDOCUIMAGES)/arrow-1.gif \
     $(DESTDIRDOCUIMAGES)/arrow-3.gif \
-    $(DESTDIRDOCUIMAGES)/bg_table.gif \
-    $(DESTDIRDOCUIMAGES)/bg_table2.gif \
-    $(DESTDIRDOCUIMAGES)/bg_table3.gif \
+    $(DESTDIRDOCUIMAGES)/bg_table.png \
+    $(DESTDIRDOCUIMAGES)/bg_table2.png \
+    $(DESTDIRDOCUIMAGES)/bg_table3.png \
     $(DESTDIRDOCUIMAGES)/nav_down.png \
     $(DESTDIRDOCUIMAGES)/nav_home.png \
     $(DESTDIRDOCUIMAGES)/nav_left.png \
     $(DESTDIRDOCUIMAGES)/nav_right.png \
     $(DESTDIRDOCUIMAGES)/nav_up.png \
-    $(DESTDIRDOCUIMAGES)/sdk_head-1.gif \
-    $(DESTDIRDOCUIMAGES)/sdk_head-2.gif \
-    $(DESTDIRDOCUIMAGES)/sdk_head-3.gif \
+    $(DESTDIRDOCUIMAGES)/sdk_head-1.png \
+    $(DESTDIRDOCUIMAGES)/sdk_head-2.png \
     $(DESTDIRDOCUIMAGES)/sdk_line-1.gif \
     $(DESTDIRDOCUIMAGES)/sdk_line-2.gif
 
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 43732adfaa08..d6fa9c3b27a0 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -84,16 +84,16 @@ if (-d "$StartDir") {
     my @filelist = ( "install.html",
              "notsupported.html","sdk_styles.css","tools.html",
              "images/arrow-1.gif", "images/arrow-3.gif",
-             "images/bg_table.gif","images/bg_table2.gif",
-             "images/bg_table3.gif", "images/nav_down.png",
+             "odk-footer-logo.png",
+             "images/bg_table.png","images/bg_table2.png",
+             "images/bg_table3.png", "images/nav_down.png",
              "images/nav_home.png","images/nav_left.png",
              "images/nav_right.png","images/nav_up.png",
-             "images/sdk_head-1.gif", "images/sdk_head-2.gif",
-             "images/sdk_head-3.gif", "images/sdk_line-1.gif",
-             "images/sdk_line-2.gif", "common/ref/idl.css",
-             "images/nada.gif","images/arrow-2.gif",
-             "images/bluball.gif","images/so-main-app_32.png",
-             "images/ooo-main-app_32.png");
+             "images/sdk_head-1.png", "images/sdk_head-2.png",
+             "images/sdk_line-1.gif", "images/sdk_line-2.gif",
+             "common/ref/idl.css", "images/nada.gif",
+             "images/arrow-2.gif", "images/bluball.gif",
+             "images/orc-main-app_32.png", "images/ooo-main-app_32.png");
 
     foreach $i (@filelist)
     {