Merge remote branch 'origin/plu/qtip2' into author-wishlist

metacpan · Aug 5, 2011 · 1f21d68 · 1f21d68
2 parents cc1c9ec + ed2c144
commit 1f21d68
Show file tree

Hide file tree

Showing 38 changed files with 390 additions and 172 deletions.
diff --git a/app.psgi b/app.psgi
@@ -34,9 +34,10 @@ $app = Plack::Middleware::Assets->wrap( $app,
     files => [<root/static/css/*.css>] );
 $app = Plack::Middleware::Assets->wrap(
     $app,
+    # should we autoload the syntax brushes or otherwise specify which ones are needed (instead of "all")?
     files => [
         map {"root/static/js/$_.js"}
-            qw(jquery.min jquery.tablesorter jquery.cookie jquery.relatize_date jquery.ajaxQueue jquery.autocomplete.pack jquery.bubblepopup.min shCore shBrushPerl shBrushDiff cpan github)
+            qw(jquery.min jquery.tablesorter jquery.cookie jquery.relatize_date jquery.ajaxQueue jquery.qtip.pack jquery.autocomplete.pack shCore shBrushPerl shBrushPlain shBrushYaml shBrushJScript shBrushDiff cpan github)
     ],
     minify => 0,
 );

diff --git a/lib/MetaCPAN/Web/Controller/Source.pm b/lib/MetaCPAN/Web/Controller/Source.pm
@@ -11,10 +11,23 @@ sub index : PathPart('source') : Chained('/') : Args {
         = ( $c->model('API::Module')->source(@module)
             & $c->model('API::Module')->get(@module) )->recv;
     if ( $source->{raw} ) {
+        # could this be a method/function somewhere else?
+        my $filetype = do {
+            local $_ = $module->{path};
+            # what other file types can we check for?
+            m!\.p[ml]$!i  ? 'pl'   :
+            m!\.pod$!     ? 'pl'   :   # no separate pod brush as of 2011-08-04
+            m!\.ya?ml$!   ? 'yaml' :
+            m!\.js(on)?$! ? 'js'   :
+            $module->{mime} =~ /perl/ ? 'pl' :
+                # default to plain text
+                'plain';
+        };
         $c->stash(
             {   template => 'source.html',
                 source   => $source->{raw},
                 module   => $module,
+                filetype => $filetype,
             }
         );
     }

diff --git a/root/inc/release-info.html b/root/inc/release-info.html
@@ -1,7 +1,7 @@
       <% IF release.resources.homepage %><li><a href="<% release.resources.homepage %>">Homepage</a></li><% END %>
       <li><% release.resources %></li>
       <% IF release.resources.repository %>
-      <li id="release-info-repository">
+      <li>
         <% IF release.resources.repository.web %>
         <a href="<% release.resources.repository.web %>">Repository</a>
         <% END %>

diff --git a/root/source.html b/root/source.html
@@ -24,7 +24,7 @@
 </div>
 
 <div class="content">
-<pre class="brush: pl; class-name: 'highlight'; toolbar: false;" id="source"><% source %></pre>
+<pre class="brush: <% filetype %>; class-name: 'highlight'; toolbar: false;" id="source"><% source %></pre>
 </div>
 
 <script type="text/javascript">

diff --git a/root/static/css/jquery.bubblepopup.css b/root/static/css/jquery.bubblepopup.css
diff --git a/root/static/css/jquery.qtip.min.css b/root/static/css/jquery.qtip.min.css
diff --git a/root/static/css/style.css b/root/static/css/style.css
@@ -599,8 +599,35 @@ code { font-family: monospace; }
     width: 160px;
 }
 
-table .release-info-github th {
+body div.qtip div.content {
+    padding: 0;
+    margin: 0;
+    height: auto; min-height: auto;
+    width: auto; min-width: auto;
+}
+
+.ui-tooltip, .qtip {
+    font-size: 12px;
+    max-width: 800px;
+}
+
+.ui-tooltip-content {
+    padding: 0;
+}
+
+div.qtip-github table {
+    width: 100%;
+}
+
+div.qtip-github table td, div.qtip-github table th {
+    padding: 3px;
+    border: 1px solid #F1F1F1;
+}
+
+div.qtip-github table th {
     padding-right: 8px;
+    white-space: nowrap;
+    background-color: #F9F9F9;
 }
 
 .release-table {

diff --git a/root/static/images/jquerybubblepopup-theme/grey/bottom-left.png b/root/static/images/jquerybubblepopup-theme/grey/bottom-left.png
diff --git a/root/static/images/jquerybubblepopup-theme/grey/bottom-middle.png b/root/static/images/jquerybubblepopup-theme/grey/bottom-middle.png
diff --git a/root/static/images/jquerybubblepopup-theme/grey/bottom-right.png b/root/static/images/jquerybubblepopup-theme/grey/bottom-right.png
diff --git a/root/static/images/jquerybubblepopup-theme/grey/ie/bottom-left.gif b/root/static/images/jquerybubblepopup-theme/grey/ie/bottom-left.gif
diff --git a/root/static/images/jquerybubblepopup-theme/grey/ie/bottom-middle.gif b/root/static/images/jquerybubblepopup-theme/grey/ie/bottom-middle.gif
diff --git a/root/static/images/jquerybubblepopup-theme/grey/ie/bottom-right.gif b/root/static/images/jquerybubblepopup-theme/grey/ie/bottom-right.gif
diff --git a/root/static/images/jquerybubblepopup-theme/grey/ie/middle-left.gif b/root/static/images/jquerybubblepopup-theme/grey/ie/middle-left.gif
diff --git a/root/static/images/jquerybubblepopup-theme/grey/ie/middle-right.gif b/root/static/images/jquerybubblepopup-theme/grey/ie/middle-right.gif
diff --git a/root/static/images/jquerybubblepopup-theme/grey/ie/tail-bottom.gif b/root/static/images/jquerybubblepopup-theme/grey/ie/tail-bottom.gif
diff --git a/root/static/images/jquerybubblepopup-theme/grey/ie/tail-left.gif b/root/static/images/jquerybubblepopup-theme/grey/ie/tail-left.gif
diff --git a/root/static/images/jquerybubblepopup-theme/grey/ie/tail-right.gif b/root/static/images/jquerybubblepopup-theme/grey/ie/tail-right.gif
diff --git a/root/static/images/jquerybubblepopup-theme/grey/ie/tail-top.gif b/root/static/images/jquerybubblepopup-theme/grey/ie/tail-top.gif
diff --git a/root/static/images/jquerybubblepopup-theme/grey/ie/top-left.gif b/root/static/images/jquerybubblepopup-theme/grey/ie/top-left.gif
diff --git a/root/static/images/jquerybubblepopup-theme/grey/ie/top-middle.gif b/root/static/images/jquerybubblepopup-theme/grey/ie/top-middle.gif
diff --git a/root/static/images/jquerybubblepopup-theme/grey/ie/top-right.gif b/root/static/images/jquerybubblepopup-theme/grey/ie/top-right.gif
diff --git a/root/static/images/jquerybubblepopup-theme/grey/middle-left.png b/root/static/images/jquerybubblepopup-theme/grey/middle-left.png
diff --git a/root/static/images/jquerybubblepopup-theme/grey/middle-right.png b/root/static/images/jquerybubblepopup-theme/grey/middle-right.png
diff --git a/root/static/images/jquerybubblepopup-theme/grey/tail-bottom.png b/root/static/images/jquerybubblepopup-theme/grey/tail-bottom.png
diff --git a/root/static/images/jquerybubblepopup-theme/grey/tail-left.png b/root/static/images/jquerybubblepopup-theme/grey/tail-left.png
diff --git a/root/static/images/jquerybubblepopup-theme/grey/tail-right.png b/root/static/images/jquerybubblepopup-theme/grey/tail-right.png
diff --git a/root/static/images/jquerybubblepopup-theme/grey/tail-top.png b/root/static/images/jquerybubblepopup-theme/grey/tail-top.png
diff --git a/root/static/images/jquerybubblepopup-theme/grey/top-left.png b/root/static/images/jquerybubblepopup-theme/grey/top-left.png
diff --git a/root/static/images/jquerybubblepopup-theme/grey/top-middle.png b/root/static/images/jquerybubblepopup-theme/grey/top-middle.png
diff --git a/root/static/images/jquerybubblepopup-theme/grey/top-right.png b/root/static/images/jquerybubblepopup-theme/grey/top-right.png