Sākums Izpētīt Palīdzība
Pierakstīties
Tranyi
/
blazer
3
0
Atdalīts 0
Faili Problēmas 0 Izmaiņu pieprasījumi 0 Vikivietne
Pārlūkot izejas kodu

Merge branch 'master' into groupdate_hack

Andrew Kane 10 gadi atpakaļ
vecāks
eca5b7c814 43b568b97a
revīzija
cb96427cf8
10 mainītis faili ar 17 papildinājumiem un 13 dzēšanām
Dalītais skats Rādīt salīdzināšanas statistiku
  1. 2 2
      app/helpers/blazer/base_helper.rb
  2. 1 1
      app/views/blazer/checks/index.html.erb
  3. 1 1
      app/views/blazer/dashboards/index.html.erb
  4. 1 1
      app/views/blazer/dashboards/show.html.erb
  5. 1 1
      app/views/blazer/queries/edit.html.erb
  6. 5 1
      app/views/blazer/queries/home.html.erb
  7. 1 1
      app/views/blazer/queries/new.html.erb
  8. 3 3
      app/views/blazer/queries/run.html.erb
  9. 1 1
      app/views/blazer/queries/show.html.erb
  10. 1 1
      app/views/layouts/blazer/application.html.erb

+ 2 - 2
app/helpers/blazer/base_helper.rb
Parādīt failu 

@@ -1,6 +1,6 @@
 
 module Blazer
 
   module BaseHelper
 
-    def title(title = nil)
 
+    def blazer_title(title = nil)
 
       if title
 
         content_for(:title) { title }
 
       else
 
@@ -8,7 +8,7 @@ module Blazer
 
       end
 
     end
 
 
-    def format_value(key, value)
 
+    def blazer_format_value(key, value)
 
       if value.is_a?(Integer) && !key.to_s.end_with?("id")
 
         number_with_delimiter(value)
 
       else

+ 1 - 1
app/views/blazer/checks/index.html.erb
Parādīt failu 

@@ -1,4 +1,4 @@
 
-<% title "Checks" %>
 
+<% blazer_title "Checks" %>
 
 
 <p style="float: right;"><%= link_to "New Check", new_check_path, class: "btn btn-info" %></p>
 
 <%= render partial: "blazer/nav" %>

+ 1 - 1
app/views/blazer/dashboards/index.html.erb
Parādīt failu 

@@ -1,4 +1,4 @@
 
-<% title "Dashboards" %>
 
+<% blazer_title "Dashboards" %>
 
 
 <p style="float: right;"><%= link_to "New Dashboard", new_dashboard_path, class: "btn btn-info" %></p>
 
 <%= render partial: "blazer/nav" %>

+ 1 - 1
app/views/blazer/dashboards/show.html.erb
Parādīt failu 

@@ -1,4 +1,4 @@
 
-<% title @dashboard.name %>
 
+<% blazer_title @dashboard.name %>
 
 
 <script>
 
   function submitIfCompleted($form) {

+ 1 - 1
app/views/blazer/queries/edit.html.erb
Parādīt failu 

@@ -1,2 +1,2 @@
 
-<% title "Edit - #{@query.name}" %>
 
+<% blazer_title "Edit - #{@query.name}" %>
 
 <%= render partial: "form" %>

+ 5 - 1
app/views/blazer/queries/home.html.erb
Parādīt failu 

@@ -43,7 +43,11 @@
 
 </script>
 
 
 <% if @queries.size == 1000 %>
 
+  <p id="loading" class="text-muted">Loading...</p>
 
   <script>
 
-    $(".list").load("<%= queries_path %>", updateList);
 
+    $(".list").load("<%= queries_path %>", function () {
 
+      updateList();
 
+      $("#loading").remove();
 
+    });
 
   </script>
 
 <% end %>

+ 1 - 1
app/views/blazer/queries/new.html.erb
Parādīt failu 

@@ -1,2 +1,2 @@
 
-<% title "New Query" %>
 
+<% blazer_title "New Query" %>
 
 <%= render partial: "form" %>

+ 3 - 3
app/views/blazer/queries/run.html.erb
Parādīt failu 

@@ -65,7 +65,7 @@
 
       </script>
 
     <% elsif @only_chart %>
 
       <% if @rows.size == 1 && @rows.first.size == 1 %>
 
-        <p style="font-size: 160px;"><%= format_value(@rows.first.keys.first, @rows.first.values.first) %></p>
 
+        <p style="font-size: 160px;"><%= blazer_format_value(@rows.first.keys.first, @rows.first.values.first) %></p>
 
       <% else %>
 
         <% @no_chart = true %>
 
       <% end %>
 
@@ -99,9 +99,9 @@
 
                       <% if v == "" %>
 
                         <div class="text-muted">empty string</div>
 
                       <% elsif @linked_columns[k] %>
 
-                        <%= link_to format_value(k, v), @linked_columns[k].gsub("{value}", u(v.to_s)), target: "_blank" %>
 
+                        <%= link_to blazer_format_value(k, v), @linked_columns[k].gsub("{value}", u(v.to_s)), target: "_blank" %>
 
                       <% else %>
 
-                        <%= format_value(k, v) %>
 
+                        <%= blazer_format_value(k, v) %>
 
                       <% end %>
 
 
                       <% if v2 = (@boom[k] || {})[v] %>

+ 1 - 1
app/views/blazer/queries/show.html.erb
Parādīt failu 

@@ -1,4 +1,4 @@
 
-<% title @query.name %>
 
+<% blazer_title @query.name %>
 
 
 <script>
 
   function submitIfCompleted($form) {

+ 1 - 1
app/views/layouts/blazer/application.html.erb
Parādīt failu 

@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 
 <html>
 
   <head>
 
-    <title><%= title ? title : "Blazer" %></title>
 
+    <title><%= blazer_title ? blazer_title : "Blazer" %></title>
 
 
     <meta charset="utf-8" />