More fixes

jshirley · Apr 11, 2010 · 2aecf7f · 2aecf7f
1 parent 87057ad
commit 2aecf7f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/lib/StyleGuide.pm b/lib/StyleGuide.pm
@@ -43,6 +43,26 @@ __PACKAGE__->config(
 # Start the application
 __PACKAGE__->setup();
 
+sub static_uri {
+    my ( $c, $asset, $query ) = @_;
+    my $static_path = $c->stash->{page}->{static_root} ||
+                        $c->view('TT')->config->{static_root} || '/static';
+    my $uri;
+    if ( $static_path =~ /^https?/ ) {
+        $static_path =~ s/\/$//;
+        $uri = URI->new( "$static_path/$asset" );
+        if ( ref $query eq 'HASH' ) {
+            $uri->query_form( $query );
+        }
+    } else {
+        if ( $query and $query eq 'HASH' ) {
+            $uri = $c->uri_for( $static_path, $asset, $query );
+        } else {
+            $uri = $c->uri_for( $static_path, $asset );
+        }
+    }
+    return $uri;
+}
 
 =head1 NAME
 

diff --git a/shared/site/global.tt b/shared/site/global.tt
@@ -41,8 +41,12 @@ MACRO ad_slot(zone, slot) BLOCK;
 END;
 
 MACRO run_widget(name, args) BLOCK;
-  SET w = widget.load(name, args);
-  INCLUDE "widgets/${w.template}" args = w.run(args);
+    SET w = widget.load(name, args);
+    IF w.template;
+    INCLUDE "widgets/${w.template}" args = w.run(args);
+    ELSE;
+        "Widget: $name not running (no template)";
+    END;
 END;
 
 MACRO select_field(info) BLOCK;

diff --git a/shared/site/html.tt b/shared/site/html.tt
@@ -25,7 +25,7 @@ FOREACH script IN page.head.scripts;
     NEXT UNLESS script;
     script = script.match('^(https?://|/)') ?
                     script :
-                    static("scripts/$script", 1); -%]
+                    c.static_uri("scripts/$script", 1); -%]
     <script type="text/javascript" src="[% script %]"></script>
 [%
 END;
@@ -36,10 +36,9 @@ FOREACH stylesheet IN page.head.stylesheets;
     NEXT UNLESS stylesheet;
     stylesheet = stylesheet.match('^(https?://|/)') ?
                     stylesheet :
-                    static("css/$stylesheet", 1); -%]
+                    c.static_uri("css/$stylesheet", 1); -%]
    <link rel="stylesheet" href="[% stylesheet %]" type="text/css" media="screen">
 [% END %]
-    <link rel="stylesheet" href="[% static( 'css/screen.css', 1 ) %]" type="text/css" media="screen">
     <style type="text/css" id="styleoverrides"></style>
  </head>
 [%
@@ -54,7 +53,7 @@ FOREACH stylesheet IN page.head.stylesheets;
         NEXT UNLESS script;
         script = script.match('^(https?://|/)') ?
                         script :
-                        static("scripts/$script", undef, 1); -%]
+                        c.static_uri("scripts/$script", undef, 1); -%]
         <script type="text/javascript" src="[% script %]"></script>
     [% END %]
  </body>