Chris Leonello avatar Chris Leonello committed add0102

Updates to build and examples.

Comments (0)

Files changed (5)

             <include name="*.php" />
             <exclude name="opener.php" />
             <exclude name="bodyOpener.php" />
+            <exclude name="openerNoHeader.php" />
+            <exclude name="bodyOpenerNoHeader.php" />
             <exclude name="nav.php" />
             <exclude name="kcp_pyramid_by_age.php" />
           </fileset>
   <target name="compress" depends="dist, min, docs" description="Create the zip, gzip, and bzip compressed archives for downloading">
       <zip destfile="${DIST_DIR}/jquery.jqplot.${version}r${HG_ID}.zip"
        basedir=""
-       includes="${DIST_DIR}/excanvas*.js ${DIST_DIR}/jquery.js ${DIST_DIR}/jquery.min.js ${DIST_DIR}/jquery.jqplot.* ${DIST_DIR}/*.txt ${DIST_DIR}/plugins/* ${DIST_DIR}/examples/* ${DIST_DIR}/examples/images/* ${DIST_DIR}/examples/syntaxhighlighter/* ${DIST_DIR}/examples/syntaxhighlighter/scripts/* ${DIST_DIR}/examples/syntaxhighlighter/styles/* ${DIST_DIR}/examples/jquery-ui/css/ui-lightness/* ${DIST_DIR}/examples/jquery-ui/css/ui-lightness/images/* ${DIST_DIR}/examples/jquery-ui/css/smoothness/* ${DIST_DIR}/examples/jquery-ui/css/smoothness/images/* ${DIST_DIR}/examples/jquery-ui/js/* ${DIST_DIR}/docs/* ${DIST_DIR}/docs/files/* ${DIST_DIR}/docs/files/examples/* ${DIST_DIR}/docs/files/images/* ${DIST_DIR}/docs/files/plugins/* ${DIST_DIR}/docs/index/* ${DIST_DIR}/docs/javascript/* ${DIST_DIR}/docs/search/* ${DIST_DIR}/docs/styles/*"
+       includes="${DIST_DIR}/excanvas*.js ${DIST_DIR}/jquery.js ${DIST_DIR}/jquery.min.js ${DIST_DIR}/jquery.jqplot.* ${DIST_DIR}/*.txt ${DIST_DIR}/plugins/* ${DIST_DIR}/examples/* ${DIST_DIR}/examples/images/* ${DIST_DIR}/examples/colorpicker/* ${DIST_DIR}/examples/colorpicker/images/* ${DIST_DIR}/examples/syntaxhighlighter/* ${DIST_DIR}/examples/syntaxhighlighter/scripts/* ${DIST_DIR}/examples/syntaxhighlighter/styles/* ${DIST_DIR}/examples/jquery-ui/css/ui-lightness/* ${DIST_DIR}/examples/jquery-ui/css/ui-lightness/images/* ${DIST_DIR}/examples/jquery-ui/css/smoothness/* ${DIST_DIR}/examples/jquery-ui/css/smoothness/images/* ${DIST_DIR}/examples/jquery-ui/js/* ${DIST_DIR}/docs/* ${DIST_DIR}/docs/files/* ${DIST_DIR}/docs/files/examples/* ${DIST_DIR}/docs/files/images/* ${DIST_DIR}/docs/files/plugins/* ${DIST_DIR}/docs/index/* ${DIST_DIR}/docs/javascript/* ${DIST_DIR}/docs/search/* ${DIST_DIR}/docs/styles/*"
       />
       <tar destfile="${DIST_DIR}/jquery.jqplot.${version}r${HG_ID}.tar.gz" compression="gzip">
           <zipfileset src="${DIST_DIR}/jquery.jqplot.${version}r${HG_ID}.zip"/>

examples/kcp_area2.php

+<?php 
+    $title = "Area Chart";
+    // $plotTargets = array (array('id'=>'chart1', 'width'=>600, 'height'=>400));
+?>
+<?php include "openerNoHeader.php"; ?>
+
+<!-- Example scripts go here -->
+
+
+  <link class="include" type="text/css" href="jquery-ui/css/smoothness/jquery-ui.min.css" rel="Stylesheet" /> 
+
+   <style type="text/css">
+
+    .chart-container {
+        border: 1px solid darkblue;
+        padding: 30px 0px 30px 30px;
+        width: 900px;
+        height: 400px;
+        
+    }
+
+    table.jqplot-table-legend {
+        font-size: 0.65em;
+        line-height: 1em;
+        margin: 0px 0px 10px 15px;
+    }
+
+    td.jqplot-table-legend-label {
+      width: 20em;
+    }
+
+    div.jqplot-table-legend-swatch {
+        border-width: 2px 6px;
+    }
+
+    div.jqplot-table-legend-swatch-outline {
+        border: none;
+    }
+
+    #chart1 {
+        width: 96%;
+        height: 96%;
+    }
+
+    .jqplot-datestamp {
+      font-size: 0.8em;
+      color: #777;
+/*      margin-top: 1em;
+      text-align: right;*/
+      font-style: italic;
+      position: absolute;
+      bottom: 15px;
+      right: 15px;
+    }
+
+    td.controls li {
+        list-style-type: none;
+    }
+
+    td.controls ul {
+        margin-top: 0.5em;
+        padding-left: 0.2em;
+    }
+
+    pre.code {
+        margin-top: 45px;
+        clear: both;
+    }
+
+  </style>
+
+      <div class="chart-container">    
+        <div id="chart1"></div>
+        <div class="jqplot-datestamp"></div>
+    </div>
+
+    <pre class="code brush:js"></pre>
+  
+  <script class="code" type="text/javascript">
+$(document).ready(function(){
+
+    var labels = ['Rural', 'Urban'];
+
+    // make the plot
+
+    var makePlot = function (data, textStatus, jqXHR) {
+        plot1 = $.jqplot('chart1', [data.rural, data.urban], {
+            title: 'Contribution of Urban and Rural Population to National Percentiles (edited data)',
+            stackSeries: true,
+            seriesDefaults: {
+                showMarker: false,
+                fill: true,
+                fillAndStroke: true
+            },
+            legend: {
+                show: true,
+                renderer: $.jqplot.EnhancedLegendRenderer,
+                rendererOptions: {
+                    numberRows: 1
+                },
+                placement: 'outsideGrid',
+                labels: labels,
+                location: 's'
+            },
+            axes: {
+                xaxis: {
+                    pad: 0,
+                    min: 1,
+                    max: 100,
+                    tickInterval: 3,
+                    tickOptions: {
+                        showGridline: false
+                    }
+                },
+                yaxis: {
+                    min: 0,
+                    max: 1,
+                    tickOptions: {
+                      formatter: $.jqplot.PercentTickFormatter,
+                      showGridline: false,
+                      formatString: '%d%%'
+                    }
+                }
+            },
+            grid: {
+                drawBorder: false,
+                shadow: false,
+                // background: 'rgba(0,0,0,0)'  works to make transparent.
+                background: 'white'
+            }
+        });
+    };
+
+    // data is in json format in plain file.
+    // Each series is represented by a 1-D array of y values.
+    // X values will be added by jqPlot and will start 1 by default.
+    $.getJSON('kcp_area2.json', '', makePlot);
+
+    // add a date at the bottom.
+
+    var d = new $.jsDate();
+    $('div.jqplot-datestamp').html('Generated on '+d.strftime('%v'));
+
+    // make it resizable.
+    
+    $("div.chart-container").resizable({delay:20});
+
+    $('div.chart-container').bind('resize', function(event, ui) {
+        plot1.replot();
+    });
+});
+
+</script>
+
+
+<!-- End example scripts -->
+
+<!-- Don't touch this! -->
+
+<?php include "commonScripts.html" ?>
+
+<!-- End Don't touch this! -->
+
+<!-- Additional plugins go here -->
+
+  <script class="include" type="text/javascript" src="../src/plugins/jqplot.enhancedLegendRenderer.js"></script>
+  <script class="include" type="text/javascript" src="jquery-ui/js/jquery-ui.min.js"></script>
+
+<!-- End additional plugins -->
+
+<?php include "closer.html"; ?>

examples/kcp_pyramid.php

                 // For pyramid plots, the default side is right.
                 // We want to override here to put first set of bars
                 // on left.
-                {rendererOptions:{side: 'left'}},
-                {yaxis: 'y2axis'},
+                {
+                    rendererOptions:{
+                        side: 'left',
+                        synchronizeHighlight: 1
+                    }
+                },
+                {
+                    yaxis: 'y2axis',
+                    rendererOptions:{
+                        synchronizeHighlight: 0
+                    }
+                },
                 // Pyramid series are filled bars by default.
                 // The overlay series will be unfilled lines.
                 {

examples/kcp_pyramid2.php

                 // For pyramid plots, the default side is right.
                 // We want to override here to put first set of bars
                 // on left.
-                {rendererOptions:{side: "left"}},
-                {yaxis: "y2axis"},
+                {
+                    rendererOptions:{
+                        side: 'left',
+                        synchronizeHighlight: 1
+                    }
+                },
+                {
+                    yaxis: "y2axis",
+                    rendererOptions:{
+                        synchronizeHighlight: 0
+                    }
+                },
                 // Pyramid series are filled bars by default.
                 // The overlay series will be unfilled lines.
                 {

examples/kcp_pyramid_by_age.php

 
 <html>
 <head>
+<?php 
+    $title = "Pyramid Chart By Age";
+?>
     
-    <title>Quintile Chart</title>
+    <title><?php print $title ?></title>
 
     <link class="include" rel="stylesheet" type="text/css" href="../src/jquery.jqplot.css" />
     <link rel="stylesheet" type="text/css" href="examples.css" />
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.