removed whitespace from css file, added myself to CREDITS file, and

modified util.py to add back in example comment, as well as copy contents of static directory to __output__.
pyjs · Jun 21, 2012 · 9c58699 · 9c58699
1 parent 651fb7e
commit 9c58699
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/CREDITS b/CREDITS
@@ -82,6 +82,7 @@ James Hedley <jameskhedley@gmail.com>
 Daniel Hopkins <drhops@gmail.com>
 Bob Hampton <bobh@optimizations.com>
 João Ventura <joaojonesventura@gmail.com>
+Billy Earney <billy.earney@gmail.com>
 
 Erik gets a special mention for the contribution of the "Showcase".
 

diff --git a/examples/_examples/static/examples.css b/examples/_examples/static/examples.css
@@ -18,22 +18,17 @@ p {
     margin: 0px 0px 0px 10px;
     padding: 0px;
 }
-
 tr:nth-child(even) {background: #EBECE4;}
 tr:nth-child(odd)  {background: #FFF;}
-
 table tbody tr:hover {
       background: #FDFCDC; 
       word-wrap:break-word
 }
-
 table, th { border: 1px solid black;}
-
 th { text-align: left; 
      background: #000; 
      color: #FFF;
 }
-
 #pyicon { 
           background-image:url("source-py-icon.png");
           display:block;

diff --git a/examples/_examples/template/index.html.tpl b/examples/_examples/template/index.html.tpl
@@ -4,7 +4,7 @@
     <meta name="keywords" content="Python Pyjs Examples, Python Web widgets" />
     <meta name="description" content="Python Pyjs Examples" />
     <meta name="title" content="Python Web Toolkit Examples - Javascript Translator and AJAX Widgets" />
-    <link rel="stylesheet" type="text/css" href="../_examples/static/examples.css" />
+    <link rel="stylesheet" type="text/css" href="static/examples.css" />
 </head>
 <body>
     <h1 id='title'>Pyjs Examples</h1>

diff --git a/examples/_examples/util.py b/examples/_examples/util.py
@@ -9,6 +9,7 @@
 #import bz2
 import zipfile
 #import tarfile
+import shutil
 from optparse import OptionParser
 
 
@@ -81,6 +82,7 @@ def sub(m):
 
 INDEX = {
     'example': r'''
+        <!-- start {name} {{example.{name}._comment_end}}
         <tr>{{example.{name}.demo1}}
 
             <td rowspan="{{example.{name}.numdemos}}">
@@ -92,6 +94,7 @@ def sub(m):
             </td>
         </tr>
         {{example.{name}.demos}}
+        {{example.{name}._comment_start}} -->
     ''',
     'demo': r'''
         <td><a href="{target}.html">{target}</a></td>
@@ -376,3 +379,14 @@ def install(package=None, **packages):
         idx_out_fd.write(index_new)
     finally:
         idx_out_fd.close()
+
+
+    _static_dir = os.path.join(ENV['BASE_EXAMPLES'], '_examples', 'static')
+    _output_dir = os.path.join(ENV['BASE_EXAMPLES'], '__output__', 'static')
+
+    if not os.path.exists(_output_dir):
+        try:
+           shutil.copytree(_static_dir, _output_dir)
+        except Exception, e:
+           sys.stdout.write("Error copying static directory to output directory\n")
+           sys.stdout.write("%s\n" % e)