Some styles for text content areas. Pages will use these. (Tables look slightly different in the editor because borders cannot be collapsed and still show the structure)

lib/galaxy/web/controllers/page.py

@@ -13,7 +13,7 @@ class PageListGrid( grids.Grid ):
             return username + "/" + item.slug
         def get_link( self, trans, grid, item ):
             if trans.user.username:
-                return dict( action='display_by_username_and_slug', username=trans.user.username, slug=item.slug )
+                return dict( action='display_by_username_and_slug', username=item.user.username, slug=item.slug )
             else:
                 return None
     # Grid definition
@@ -44,7 +44,9 @@ class PageController( BaseController ):
     @web.expose
     @web.require_admin  
     def index( self, trans, *args, **kwargs ):
+        # Build grid
         grid = self.list( trans, *args, **kwargs )
+        # Render grid wrapped in panels
         return trans.fill_template( "page/index.mako", grid=grid )
              
     @web.expose

static/june_2007_style/base.css.tmpl

@@ -629,3 +629,45 @@ div.permissionContainer {
 .grid .current {
     background-color: #EEEEFF;
 }
+
+## Styles for areas of text content
+
+.text-content {
+
+    hr {
+            display:block;
+            background:black;
+            color:black;
+            width:100%;
+            height:1px;
+            border:none;
+            background:#aaa;
+            color:#aaa;
+    }
+    
+    table
+    {
+            border-collapse:collapse;
+            border-top:1px solid #ccc;
+            border-left:1px solid #ccc;
+    }
+    
+    blockquote {
+            color:#666;
+    }
+    
+    fieldset {
+            border-color:#ccc;
+            border:1px solid #ccc;
+    }
+    
+    th,td {
+            border-bottom:1px solid #ddd;
+            border-right:1px solid #ccc;
+    }
+    
+    th,td {
+            padding:.8em;
+    }
+
+}

static/june_2007_style/blue/base.css

@@ -106,3 +106,10 @@ div.permissionContainer{padding-left:20px;}
 .grid thead th{background:#ebd9b2;background-repeat:repeat-x;background-position:top;border-top:solid #d8b365 1px;border-bottom:solid #d8b365 1px;padding:0.5em 1em;text-align:left;}
 .grid tfoot td{background-color:#F8F8F8;border-top:solid #DDDDDD 1px;border-bottom:solid #DDDDDD 1px;padding:0.5em 1em;}
 .grid .current{background-color:#EEEEFF;}
+.text-content{}
+.text-content hr{display:block;background:black;color:black;width:100%;height:1px;border:none;background:#aaa;color:#aaa;}
+.text-content table{border-collapse:collapse;border-top:1px solid #ccc;border-left:1px solid #ccc;}
+.text-content blockquote{color:#666;}
+.text-content fieldset{border-color:#ccc;border:1px solid #ccc;}
+.text-content th,.text-content td{border-bottom:1px solid #ddd;border-right:1px solid #ccc;}
+.text-content th,.text-content td{padding:.8em;}

static/june_2007_style/process_css.py

@@ -12,7 +12,11 @@ CSS processor for Galaxy style sheets. Supports the following features:
 import sys, string, os.path
 from pyparsing import *
 from odict import odict
-import Image
+
+try:
+    import Image
+except ImportError:
+    from PIL import Image
 
 def cross_lists(*sets):
     """

static/wymeditor/iframe/galaxy/wymiframe.css

@@ -19,11 +19,6 @@
 
 /* VISUAL FEEDBACK */
 
-/* Galaxy font styles */
-
-body{font:13px/1.231 verdana,arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;}select,input,button,textarea,button{font:99% verdana,arial,helvetica,clean,sans-serif;}table{font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%;}
-body{font-size:75%;}
-
 /* basic */
  
 /* make HTML blocs visible */
@@ -38,15 +33,15 @@ body{font-size:75%;}
   ol,
   table,
   blockquote,
-  pre           { background: #FFFFFF no-repeat 2px 2px;
-                  padding:8px 5px 5px;
-                  margin:10px; }
+  pre           { background: #FFFFFF no-repeat 2px 2px !important;
+                  padding:8px 5px 5px !important;
+                  margin:10px !important; }
   td            { background: #F0F4F8; }
   th            { background: #ffffcc; }
   ul,
   ol            { border-left:20px solid #B9C4D0; padding:0px 5px; }
   caption       { background: #E4E4B0; padding: 5px; font-weight: bold; }
-  table         { font-size: 12px; width: 500px; }
+  table         { font-size: 12px; min-width: 500px; border: none !important; border-collapse: separate !important }
   td            { width: 25%; }
   blockquote    { margin-left: 30px; }
   pre           { background-color:transparent; border: 1px solid white; }

static/wymeditor/iframe/galaxy/wymiframe.html

@@ -20,7 +20,8 @@
 <head>
 <title>WYMeditor iframe</title>
 <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
+<link rel="stylesheet" type="text/css" media="screen" href="../../../style/base.css" />
 <link rel="stylesheet" type="text/css" media="screen" href="wymiframe.css" />
 </head>
-<body class="wym_iframe"></body>
+<body class="wym_iframe text-content"></body>
 </html>

templates/page/display.mako

@@ -20,7 +20,7 @@
 
     <div class="unified-panel-body">
         <div style="overflow: auto; height: 100%;">
-        <div class="page-container" style="padding: 10px;">
+        <div class="page text-content" style="padding: 10px;">
         ${page.latest_revision.content.decode( "utf-8" )}
         </div>
         </div>