Commits

Chris Leonello committed f235718

Lots of clean up and tweaking to get site style same for docs and tests.

  • Participants
  • Parent commits 58f524a

Comments (0)

Files changed (12)

 Format: 1.4
 
 
-Title: jqPlot
-SubTitle: Pure Javascript plotting the jQuery way.
+# You can add a title and sub-title to your menu like this:
+# Title: [project name]
+# SubTitle: [subtitle]
 
 Footer: Copyright (c) 2009 Chris Leonello
 Timestamp: Updated month day, year

NDdata/docstyles.css

+html, body {
+  height: 100%;
+}
+
+/*
+div.Firefox {
+  height: 100%;
+}
+*/
+
 .MTitle {
     font-variant: normal;
 }
     font-style: normal;
 }
 
+.CBody {
+margin-left: 30px;
+margin-right: 30px;
+}
+
+p {
+   text-indent: 0;
+   margin-bottom: 1em;
+   }
+
 .CBody p {
+/*
     padding-top: 4px;
     padding-bottom: 4px;
-}
+*/
+}
+
+#Menu {
+  margin-top: 94px;
+  border: 0px;
+}
+
+body {
+  background-image: url('../files/samples/background.jpg');
+  background-color: #818181;
+}
+
+.MGroup a:link,
+.MGroup a:hover,
+.MGroup a:visited { color: #bfbfbf; margin-right: 10px }
+.MGroup a:active { color: #f58f07; margin-right: 10px }
+
+
+.MEntry a:link,
+.MEntry a:hover,
+.MEntry a:visited { color: #bfbfbf; margin-right: 0 }
+.MEntry a:active { color: #f58f07; margin-right: 0 }
+
+#Footer {
+  color: #bfbfbf;
+}
+
+#Footer a:link, #Footer a:hover, #Footer a:visited {
+  color: #5c93f0;
+}
+
+#MainTopic h1.CTitle {
+	color: #292929;
+	font-size: 0px;
+	font-style: normal;
+	font-weight: normal;
+	border-width: 0px;
+	padding: 0px;
+	margin: 0px;
+	background-position: left top;
+	background-repeat: no-repeat;
+	background-image: url('../files/samples/logo.jpg');
+	background-color: #292929;
+	height: 94px;
+
+}
+
+#MainTopic h1.CTitle a {
+  display: none;
+}
+
+
+#MainTopic div.CBody p:first-child {
+  margin-top: 24px;
+}
+
+.ContentPage #Content {
+  border: 0px;
+/*   height: 100%; */
+}
+
+#IPageLogo {
+	width: 100%;
+	color: #292929;
+	font-size: 0px;
+	font-style: normal;
+	font-weight: normal;
+	border-width: 0px;
+	padding: 0px;
+	margin: 0px;
+	background-position: 27ex top;
+	background-repeat: no-repeat;
+	background-image: url('../files/samples/logo.jpg');
+	background-color: #292929;
+	height: 94px;
+}
+
+.IPageTitle {
+  background-color:#FFFFF0;
+  color: #333333;
+  border: 0px;
+}
+
 		<echo message="Test Suite Finished" />
 	</target>
 
-	<target name="docs" depends="dist" description="Create documentation for distribution.">
+	<target name="docs" description="Create documentation for distribution.">
 		<echo message="Creating documentation" />
         <mkdir dir="${DIST_DIR}/docs" />
         <exec executable="${ND}">
           <fileset dir="${DIST_DIR}/docs/index" includes="*.html" />
           <fileset dir="${DIST_DIR}/docs/files" includes="*.html" />
         </replaceregexp>
+        <copy todir="${DIST_DIR}/docs/files/samples">
+          <fileset dir="${SRC_DIR}/samples" includes="background.jpg" />
+          <fileset dir="${SRC_DIR}/samples" includes="logo.jpg" />
+    		</copy>
         <echo message="Documentation Finished" />
 	</target>
 

extras/NaturalDocs/Modules/NaturalDocs/Builder/HTML.pm

 
         . "\n\n\n"
 
-        . '<div id=Index>'
+        . '<div id="IPageLogo">&nbsp;</div><div id=Index>'
             . '<div class=IPageTitle>'
                 . $indexTitle
             . '</div>';

src/samples/background.jpg

Added
New image

src/samples/logo.jpg

Added
New image

tests/canvasAxisTests.php

       tickOptions:{formatString:'%b %#d, %Y', fontSize:'10pt', fontFamily:'Tahoma', angle:-40}}}, \
       series:[{lineWidth:4, markerOptions:{style:'square'}}]});";
       
-      genplot(o);
+      genplot(o, '', false);
   
       prettyPrint();
       

tests/categoryAxisTests.php

       axes:{xaxis:{renderer:$.jqplot.CategoryAxisRenderer}}, \
       series:[{lineWidth:4, markerOptions:{style:'square'}}]});";
       
-      genplot(o);
+      genplot(o, '', false);
   
       prettyPrint();
       

tests/dateAxisTests.php

       axes:{xaxis:{renderer:$.jqplot.DateAxisRenderer}}, \
       series:[{lineWidth:4, markerOptions:{style:'square'}}]});";
       
-      genplot(o);
+      genplot(o, '', false);
       
       o = "line1=[['2008-06-30', 4], ['2008-7-30', 6.5], ['2008-8-30', 5.7], ['2008-9-30', 9], ['2008-10-30', 8.2]]; \
       plot10 = $.jqplot('_target_', [line1], \
       axes:{xaxis:{renderer:$.jqplot.DateAxisRenderer, tickOptions:{formatString:'%b %#d, %y'}, min:'May 30, 2008', tickInterval:'1 month'}}, \
       series:[{lineWidth:4, markerOptions:{style:'square'}}]});";
       
-      genplot(o);
+      genplot(o, '', false);
   
       prettyPrint();
       

tests/highlighterTests.php

       highlighter: {sizeAdjust: 7.5}, \
       cursor: {show: false}});";
       
-      genplot(o, c);
+      genplot(o, c, false);
       
       c ='The Cursor plugin changes the mouse cursor when it enters the graph area and displays an optional tooltip with the mouse position.  The tooltip can be in a fixed location, or it can follow the mouse.  The pointer style, set to "crosshair" by default, can also be customized.  Tooltip values are formatted similar to the Highlighter plugin.  By default they use the axes formatters, but can be customized with a sprintf format string.';
       
       return function(){return id++};
     })();
     
-    function genplot(o, c) {
+    function genplot(o, c, vs) {
       var nid, n, no;
       nid = uID();
       o = o.replace(/_target_/, 'chart'+nid);
-      n = js_beautify(o, {preserve_newlines:true, indent_size:4});
+      n = js_beautify(o, {preserve_newlines:true, indent_size:4, var_space: vs});
       if (c) $('<div class="description"></div>').insertBefore('.nav:last').html(c);
       $('<div class="jqPlot"  id="chart'+nid+'" style="height:380px; width:540px;"></div>').insertBefore('.nav:last');
       $('<pre id="code'+nid+'" class="prettyprint">'+n+'</pre>').insertBefore('.nav:last');

tests/unittests.css

 
 div.description {
     font-size: 15px;
-    width: 720px;
+    width: 660px;
     margin: 3em auto 1em auto;
     padding: 15px;
 }