characters design pass

This commit is contained in:
Andrew Brown 2014-03-13 17:39:31 +00:00
parent 49424543f2
commit c29be33e90
5 changed files with 78 additions and 68 deletions

View File

@ -1,48 +1,37 @@
<% @cardcounter = 0 %>
<% @characters.each do |character| %>
<% if @cardcounter % 4 == 0 %>
<div class="row-fluid">
<% end %>
<div class="card span3">
<h3 class="card-heading simple">
<span class="pull-right"><i class="icon-globe"></i></span>
<%= simple_format link_to character.name, character_path(character) %>
</h3>
<div class="card-body">
<p>
<strong>
<% if character.role.length > 0 %>
<%= character.role %><% if character.age.length > 0 %>, <%= character.age %><% end %>
<div class="col-md-3">
<div class="card">
<h1 class="card-heading">
<%= simple_format link_to character.name, character_path(character) %>
</h1>
<div class="card-body">
<p>
<strong>
<% if character.role.length > 0 %>
<%= character.role %><% if character.age.length > 0 %>, <%= character.age %><% end %>
<% end %>
</strong>
</p>
<p>
Lorem ipsum one-line description here lel
</p>
</div>
<div class="card-comments">
<p>
<% if session[:user] and session[:user] == character.user.id %>
<%= link_to t('.view', :default => t("helpers.links.view")),
character_path(character), :class => 'btn btn-sm' %>
<%= link_to t('.edit', :default => t("helpers.links.edit")),
character_edit_path(character), :class => 'btn btn-sm' %>
<%= link_to t('.destroy', :default => t("helpers.links.destroy")),
character_path(character),
:method => :delete,
:confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')),
:class => 'btn btn-danger btn-sm' %>
<% end %>
</strong>
</p>
<p>
Lorem ipsum one-line description here lel
</p>
</div>
<div class="card-comments">
<p>
<% if session[:user] and session[:user] == character.user.id %>
<%= link_to t('.view', :default => t("helpers.links.view")),
character_path(character), :class => 'btn btn-sm' %>
<%= link_to t('.edit', :default => t("helpers.links.edit")),
character_edit_path(character), :class => 'btn btn-sm' %>
<%= link_to t('.destroy', :default => t("helpers.links.destroy")),
character_path(character),
:method => :delete,
:confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')),
:class => 'btn btn-danger btn-sm' %>
<% end %>
</p>
</p>
</div>
</div>
</div>
<% if @cardcounter % 3 == 0 %>
<% end %>
<% @cardcounter += 1 %>
<% end %>
</div>

View File

@ -2,5 +2,7 @@
<div class="card">
<%= render :partial => 'tabs' %>
<%= render :partial => 'edit_form' %>
</div>
<div class="card-body">
<%= render :partial => 'edit_form' %>
</div>
</div>

View File

@ -1,26 +1,30 @@
<% if @characters.length > 0 %>
<div class="card">
<h3 class="card-heading simple">
Your characters
<% if Universe.where(user_id: session[:user]).length > 0 %>
<small>from <%= universe_filter %></small>
<% end %>
</h3>
<div class="row">
</div>
<%= render 'list' %>
<% end %>
<div class="card">
<h3 class="card-heading simple">Planning characters</h3>
<div class="card-body">
<p>
Consistency is sometimes hard to keep, and having a reference of everything about your character for yourself can help you down the line, especially if you're writing a series.
</p>
<%= link_to 'New character', character_create_path, :class => 'btn btn-primary' %>
<div class="col-md-12">
<div class="card" style="overflow: visible">
<h1 class="card-heading simple">
Your characters
<% if Universe.where(user_id: session[:user]).length > 0 %>
<small>from <%= universe_filter %></small>
<% end %>
</h1>
</div>
</div>
<div class="card-comments"></div>
</div>
<%= render 'list' %>
<div class="col-md-3">
<div class="card">
<h1 class="card-heading">Planning characters</h1>
<div class="card-body">
<p>
Consistency is sometimes hard to keep, and having a reference of everything about your character for yourself can help you down the line, especially if you're writing a series.
</p>
</div>
<div class="card-comments">
<%= link_to 'New character', character_create_path, :class => 'btn btn-primary' %>
</div>
</div>
</div>
</div>

View File

@ -1,8 +1,14 @@
<%- model_class = @character.class -%>
<div class="card">
<h1 class="card-heading">
<%= @character.name %>
</h1>
<%= render :partial => 'tabs' %>
<div class="card-body">
<dl class="dl-horizontal hidden section general_section">
<%= print_property("Name", @character.name, "") %>
<%= print_property("Role in story", @character.role, "") %>
@ -66,6 +72,10 @@
<%= print_property("Private notes", @character.private_notes, "") %>
<% end %>
</dl>
</div>
<div class="card-comments">
<% if session[:user] and session[:user] == @character.user.id %>
<div class="form-actions">
@ -81,4 +91,6 @@
</div>
<% end %>
</div>
</div>

View File

@ -29,6 +29,9 @@
<dl class="dl-horizontal hidden section settings_section">
<%= print_property("Privacy", @universe.privacy, "") %>
</dl>
</div>
<div class="card-comments">
<% if session[:user] and session[:user] == @universe.user.id %>
<div class="form-actions">