Skip to content

Commit

Permalink
Renamed partials for consistency to close #50
Browse files Browse the repository at this point in the history
  • Loading branch information
brzaik committed Mar 11, 2012
1 parent a53c784 commit e489567
Show file tree
Hide file tree
Showing 16 changed files with 18 additions and 29 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
<%= link_to screen do %>
<i class="icon-controller-screens"></i>
<% end %>
<b><%= link_to screen.name, screen %></b>
<p><b><%= link_to screen.name, screen %></b></p>
<p><%= screen.location %></p>
<p><%= screen.fields.count %> fields</p>
</div>
</li>
<% end %>
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion app/views/screens/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<h1>All Screens <%= link_to 'New Screen', new_screen_path, :class => "btn" %></h1>
</header>
<div id="screens-body" class="C-cont">
<%= render :partial => "screens/list_body" %>
<%= render :partial => "screens/index_body" %>
</div>
</section>
4 changes: 2 additions & 2 deletions app/views/screens/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<section class="C">
<header id="screens-header">
<%= render :partial => "screens/screen_header" %>
<%= render :partial => "screens/show_header" %>
</header>
<div id="screens-body" class="C-cont">
<%= render :partial => "screens/screen_body" %>
<%= render :partial => "screens/show_body" %>
</div>
</section>
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<ul class="GL">
<% @submissions.each do |submission| %>
<li>
<div>
<div class="cont">
<%= link_to [submission.feed, submission], :remote => true do %>
<%= render_content(submission.content, {:type => 'grid'}) %>
<% end %>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions app/views/submissions/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<section class="C no">
<header id="browse-header">
<%= render :partial => "submissions/feed_header" %>
<%= render :partial => "submissions/index_header" %>
</header>
<div id="browse-body" class="C-cont">
<%= render :partial => "submissions/feed_body" %>
<%= render :partial => "submissions/index_body" %>
</div>
</section>
4 changes: 2 additions & 2 deletions app/views/submissions/index.js.erb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
$('#browse-header').html("<%= escape_javascript(render :partial => 'submissions/feed_header') %>");
$('#browse-header').html("<%= escape_javascript(render :partial => 'submissions/index_header') %>");
$('section.C').addClass('no');
$('#browse-body').html("<%= escape_javascript(render :partial => 'submissions/feed_body') %>");
$('#browse-body').html("<%= escape_javascript(render :partial => 'submissions/index_body') %>");
4 changes: 2 additions & 2 deletions app/views/submissions/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<section class="C">
<header id="browse-header">
<%= render :partial => "submissions/content_header" %>
<%= render :partial => "submissions/show_header" %>
</header>
<div id="browse-body" class="C-cont">
<%= render :partial => "submissions/content_body" %>
<%= render :partial => "submissions/show_body" %>
</div>
</section>
16 changes: 2 additions & 14 deletions app/views/submissions/show.js.erb
Original file line number Diff line number Diff line change
@@ -1,18 +1,6 @@
/*$("#TM").slideUp("fast", function() {
$("#show-TM").slideDown("fast");
});
$(document).on("click", "#show-TM", function(event) {
event.preventDefault();
$("#show-TM").slideUp("fast", function() {
$("#TM").slideDown("fast");
});
});
*/

$("#browse-header").html("<%= escape_javascript(render :partial => 'submissions/content_header') %>");
$("#browse-header").html("<%= escape_javascript(render :partial => 'submissions/show_header') %>");
$("section.C").removeClass("no");
$("#browse-body").html("<%= escape_javascript(render :partial => 'submissions/content_body') %>");
$("#browse-body").html("<%= escape_javascript(render :partial => 'submissions/show_body') %>");

$(document).on("click", "#moderate-select button.approve", function(event) {
event.preventDefault();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
<%= link_to template, :remote => true do %>
<i class="icon-controller-templates"></i>
<% end %>
<b><%= link_to template.name, template, :remote => true %></b>
<br />
<p><b><%= link_to template.name, template, :remote => true %></b></p>
<p>by <%= template.author %></p>
</div>
</li>
Expand Down
2 changes: 1 addition & 1 deletion app/views/templates/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<h1>All Templates <%= link_to 'New Template', new_template_path, :class => "btn" %></h1>
</header>
<div id="browse-body" class="C-cont">
<%= render "list_body" %>
<%= render "index_body" %>
</div>
</section>
2 changes: 1 addition & 1 deletion app/views/templates/index.js.erb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
$('#browse-header').html("<h1>All Templates <%= escape_javascript(link_to 'New Template', new_template_path, :class => "btn") %></h1>");
$('section.C').addClass('no');
$('#browse-body').html("<%= escape_javascript(render :partial => 'templates/list_body') %>");
$('#browse-body').html("<%= escape_javascript(render :partial => 'templates/index_body') %>");

0 comments on commit e489567

Please sign in to comment.