view fixes, updated uesr profile

This commit is contained in:
albert
2011-08-15 17:10:35 -04:00
parent c6b1778145
commit d32a839aa1
15 changed files with 138 additions and 37 deletions

View File

@@ -1,3 +1,9 @@
<%= image_tag(@advertisement.image_url) %>
<%= render "form" %>
<div id="c-advertisements">
<div id="a-edit">
<h1>Edit Advertisement</h1>
<%= image_tag(@advertisement.image_url) %>
<%= render "form" %>
</div>
</div>
<%= render "secondary_links" %>

View File

@@ -1,22 +1,26 @@
<h4>Advertisements</h4>
<div id="c-advertisements">
<div id="c-index">
<h1>Advertisements</h1>
<table width="100%" class="highlightable">
<thead>
<tr>
<th width="5%"></th>
<th width="5%" style="text-align: right;">Hits</th>
<th width="90%"></th>
</tr>
</thead>
<tbody>
<% @advertisements.each do |advertisement| %>
<tr>
<td><%= image_tag(advertisement.image_url, :width => advertisement.preview_width, :height => advertisement.preview_height) %></td>
<td style="text-align: right;"><%= advertisement.hits.between(@start_date, @end_date).count %></td>
<td><%= link_to "Edit", edit_advertisement_path(advertisement) %></td>
</tr>
<% end %>
</tbody>
</table>
<table width="100%" class="highlightable">
<thead>
<tr>
<th width="5%"></th>
<th width="5%" style="text-align: right;">Hits</th>
<th width="90%"></th>
</tr>
</thead>
<tbody>
<% @advertisements.each do |advertisement| %>
<tr>
<td><%= image_tag(advertisement.image_url, :width => advertisement.preview_width, :height => advertisement.preview_height) %></td>
<td style="text-align: right;"><%= advertisement.hits.between(@start_date, @end_date).count %></td>
<td><%= link_to "Edit", edit_advertisement_path(advertisement) %></td>
</tr>
<% end %>
</tbody>
</table>
</div>
</div>
<%= render "secondary_links" %>

View File

@@ -1,3 +1,9 @@
<%= error_messages_for :advertisement %>
<%= render "form" %>
<div id="c-advertisements">
<div id="a-new">
<h1>New Advertisement</h1>
<%= error_messages_for :advertisement %>
<%= render "form" %>
</div>
</div>
<%= render "secondary_links" %>

View File

@@ -1,7 +1,14 @@
<div><%= image_tag(@advertisement.image_url, :width => @advertisement.preview_width, :height => @advertisement.preview_height) %></div>
<div id="c-advertisements">
<div id="a-show">
<h1>Show Advertisement</h1>
<%= image_tag(@advertisement.image_url, :width => @advertisement.preview_width, :height => @advertisement.preview_height) %>
<ul>
<li>Hits: <%= @advertisement.hits.between(@start_date, @end_date).count %></li>
</ul>
</div>
</div>
<ul>
<li>Hits: <%= @advertisement.hits.between(@start_date, @end_date).count %></li>
</ul>
<%= render "secondary_links" %>

View File

@@ -1,5 +1,7 @@
<div id="c-artists">
<div id="a-index">
<h1>Artists</h1>
<table class="striped" width="100%">
<thead>
<tr>

View File

@@ -1,5 +1,7 @@
<div class="bans">
<div class="index">
<h1>Bans</h1>
<table>
<thead>
<tr>

View File

@@ -1,5 +1,7 @@
<div id="c-comments">
<div id="a-index">
<h1>Comments</h1>
<div class="comments-for-post">
<div class="list-of-comments">
<% @comments.each do |comment| %>

View File

@@ -1,6 +1,7 @@
<div id="c-comments">
<div id="a-search">
<h1>Search Comments</h1>
<%= simple_form_for(@search) do |f| %>
<%= hidden_field_tag "group_by", "comment" %>
<%= f.input :body_matches, :label => "Body", :required => false %>

View File

@@ -1,2 +1,7 @@
<h1>Edit Message</h1>
<%= render :partial => "form", :locals => {:dmail => @dmail} %>
<div id="c-dmails">
<div id="a-edit">
<h1>Edit Message</h1>
<%= render "form", :dmail => @dmail %>
</div>
</div>

View File

@@ -1,3 +1,6 @@
<div id="c-dmails">
</div>
<h1>Messages</h1>
<%= render "search" %>

View File

@@ -16,9 +16,6 @@
<option value="lock-note">Lock notes</option>
<option value="edit-tag-script">Edit tag script</option>
<option value="apply-tag-script">Apply tag script</option>
<% if CurrentUser.user.is_janitor? %>
<option value="approve">Approve</option>
<% end %>
</select>
</form>
</section>

View File

@@ -1,3 +1,54 @@
<h1>Namasté <%= CurrentUser.pretty_name %>!</h1>
<div id="c-users">
<div id="a-show">
<h1>Show User: <%= CurrentUser.pretty_name %></h1>
<dl>
<dt>Join Date</dt>
<dd><%= @presenter.join_date %></dd>
<dt>Inviter</dt>
<dd><%= @presenter.inviter(self) %></dd>
<dt>Level</dt>
<dd><%= @presenter.level %></dd>
<dt>Upload Limit</dt>
<dd><%= @presenter.upload_limit %></dd>
<dt>Uploads</dt>
<dd><%= @presenter.uploads(self) %></dd>
<dt>Deleted Uploads</dt>
<dd><%= @presenter.deleted_uploads(self) %></dd>
<dt>Favorites</dt>
<dd><%= @presenter.favorites(self) %></dd>
<dt>Subscriptions</dt>
<dd><%= @presenter.subscriptions(self) %></dd>
<dt>Post Changes</dt>
<dd><%= @presenter.post_versions(self) %></dd>
<dt>Note Changes</dt>
<dd><%= @presenter.note_versions(self) %></dd>
<dt>Wiki Page Changes</dt>
<dd><%= @presenter.wiki_page_versions(self) %></dd>
<dt>Pool Changes</dt>
<dd><%= @presenter.pool_versions(self) %></dd>
<dt>Forum Posts</dt>
<dd><%= @presenter.forum_posts(self) %></dd>
<dt>Approvals</dt>
<dd><%= @presenter.approvals(self) %></dd>
<dt>Feedback</dt>
<dd><%= @presenter.feedbacks(self) %></dd>
</dl>
</div>
</div>
<%= render :partial => "secondary_links" %>