Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

some layout code cleanup #32

Merged
merged 1 commit into from

2 participants

@timoschilling

No description provided.

@akshayrawat
Owner

Can you rebase this from master, so that I can merge it automatically.

@akshayrawat akshayrawat merged commit 759f67b into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 25, 2012
  1. @timoschilling

    some layout code cleanup

    timoschilling authored
This page is out of date. Refresh to see the latest.
Showing with 4 additions and 5 deletions.
  1. +4 −5 app/views/layouts/dj_mon.html.haml
View
9 app/views/layouts/dj_mon.html.haml
@@ -2,9 +2,11 @@
%html
%head{:lang => "en"}
%meta{:name => "apple-itunes-app", :content => "app-id=552732872"}
- = stylesheet_link_tag "dj_mon/dj_mon", :media => "screen, projection"
+ %script
+ var dj_counts_dj_reports_url = "#{dj_counts_dj_reports_url}"
= javascript_include_tag "//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"
= javascript_include_tag "dj_mon/dj_mon"
+ = stylesheet_link_tag "dj_mon/dj_mon", :media => "screen, projection"
= yield :head
%body
@@ -15,7 +17,7 @@
.pull-left
= link_to "DJ Mon", dj_reports_url, :class => "brand"
.pull-right
- = link_to "Settings", "#dj_settings_template", :rel => 'modal', 'data-content'=> "#{DjMon::DjReport.settings.to_json}", :id => 'settings', :class => 'btn btn-primary btn-mini'
+ = link_to "Settings", "#dj_settings_template", :rel => 'modal', "data-content" => DjMon::DjReport.settings.to_json, :id => "settings", :class => "btn btn-primary btn-mini"
.pull-right
#dj-counts-view
@@ -28,9 +30,6 @@
.container
= yield
- %script
- var dj_counts_dj_reports_url = "#{dj_counts_dj_reports_url}"
-
%script#dj_counts_template{ :type=> "text/x-handlebars-template" }
%span.badge.badge-warning
{{failed}} failed
Something went wrong with that request. Please try again.