Skip to content

Commit

Permalink
Fix content for heading style
Browse files Browse the repository at this point in the history
  • Loading branch information
Yannick Francois committed Oct 2, 2013
1 parent ce9c764 commit fc12a91
Show file tree
Hide file tree
Showing 31 changed files with 51 additions and 43 deletions.
2 changes: 1 addition & 1 deletion app/views/admin/cache/index.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-settings"><%= _("Cache") %></h2>
<i class="icon-large icon-settings"></i><h2 class="page-title"><%= _("Cache") %></h2>
<% end %>

<p><%= _("To save resources Publify caches content in static files. Cache is cleared each time something gets published. You may however want to clear the cache yourself.") %></p>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/categories/new.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-categories"><%= _("Categories") %></h2>
<i class="icon-large icon-categories"></i><h2 class="page-title"><%= _("Categories") %></h2>
<% end %>

<div>
Expand Down
14 changes: 7 additions & 7 deletions app/views/admin/content/edit.html.erb
@@ -1,9 +1,9 @@
<%= form_tag({:action => 'update',
:id => @article.id},
method: :post,
multipart: true,
id: "article_form",
class: 'autosave') do %>
:id => @article.id},
method: :post,
multipart: true,
id: "article_form",
class: 'autosave') do %>
<%= render :partial => "form" %>
<% end %>
<%= render :partial => "form" %>
<% end %>
2 changes: 1 addition & 1 deletion app/views/admin/content/index.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-articles"><%= _("Manage articles") %></h2>
<i class="icon-large icon-articles"></i><h2 class="page-title"><%= _("Manage articles") %></h2>
<div class="pull-right">
<%= link_to(_("New Article"), {controller: 'content', action: 'new'}, id: 'dialog-link', class: 'btn btn-info')%>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/dashboard/index.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-dashboard"><%= _("Welcome back, %s!", current_user.name) %></h2>
<i class="icon-large icon-dashboard"></i><h2 class="page-title"><%= _("Welcome back, %s!", current_user.name) %></h2>
<% end %>
<%= render "overview" %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/feedback/article.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-comment"><%= _("Comments for %s", @article.title) %></h2>
<i class="icon-large icon-comment"></i><h2 class="page-title"><%= _("Comments for %s", @article.title) %></h2>
<% end %>
<% @link_to_new = link_to(_("Add a comment"), '#comment', {:id => 'dialog-link', :class => 'button'}) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/feedback/edit.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-comment"><%= _("Comments for %s", link_to(h(@comment.article.title), :controller => '/admin/content', :action => 'edit', :id => @comment.article.id).html_safe).html_safe %></h2>
<i class="icon-large icon-comment"></i><h2 class="page-title"><%= _("Comments for %s", link_to(h(@comment.article.title), :controller => '/admin/content', :action => 'edit', :id => @comment.article.id).html_safe).html_safe %></h2>
<% end %>
<%= form_tag :action => "update", :id => @comment.id do %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/feedback/index.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-comment"><%= _("Feedback") %></h2>
<i class="icon-large icon-comment"></i><h2 class="page-title"><%= _("Feedback") %></h2>
<% end %>
<%= form_tag({:action => 'index'}, :method => :get, :class => 'form-inline') do %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/notes/new.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-notes"><%= _("Notes") %></h2>
<i class="icon-large icon-notes"></i><h2 class="page-title"><%= _("Notes") %></h2>
<% end %>

<div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/pages/index.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-pages"><%= _("Manage pages") %></h2>
<i class="icon-large icon-pages"></i><h2 class="page-title"><%= _("Manage pages") %></h2>
<div class='pull-right'>
<%= link_to(_("New Page"), {controller: 'pages', action: 'new'}, id: 'dialog-link', class: 'btn btn-info') %>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/post_types/new.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-articles-types"><%= _("Post Types") %></h2>
<i class="icon-large icon-articles-types"></i><h2 class="page-title"><%= _("Post Types") %></h2>
<% end %>

<div>
Expand Down
8 changes: 7 additions & 1 deletion app/views/admin/profiles/index.html.erb
@@ -1,5 +1,11 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-profile"><%= _("Your profile") %></h2>
<i class="icon-large icon-profile"></i><h2 class="page-title"><%= _("Your profile") %></h2>
:q


:q


<% end %>
<%= form_tag({:action => 'index', :id => @user.id}, {:enctype => "multipart/form-data"}) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/redirects/new.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-redirect"><%= _("Redirects") %></h2>
<i class="icon-large icon-redirect"></i><h2 class="page-title"><%= _("Redirects") %></h2>
<% end %>

<div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/resources/destroy.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large"><%= _("File Uploads") %></h2>
<i class="icon-large"></i><h2 class="page-title"><%= _("File Uploads") %></h2>
<% end %>

<p><%= _("Are you sure you want to delete this file")%> ( <%= @file.filename -%> )?</p>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/resources/index.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-resources"><%= _("Media library") %></h2>
<i class="icon-large icon-resources"></i><h2 class="page-title"><%= _("Media library") %></h2>
<% end %>
<%= render 'upload' -%>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/seo/index.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-settings"><%= _("Global settings") %></h2>
<i class="icon-large icon-settings"></i><h2 class="page-title"><%= _("Global settings") %></h2>
<% end %>
<%= error_messages_for 'blog' %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/seo/permalinks.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-settings"><%= _("Permalinks") %></h2>
<i class="icon-large icon-settings"></i><h2 class="page-title"><%= _("Permalinks") %></h2>
<% end %>
<%= error_messages_for 'blog' %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/seo/titles.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-settings"><%= _("Title settings") %></h2>
<i class="icon-large icon-settings"></i><h2 class="page-title"><%= _("Title settings") %></h2>
<% end %>
<%= error_messages_for 'blog' %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/settings/display.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-settings"><%= _("Display settings") %></h2>
<i class="icon-large icon-settings"></i><h2 class="page-title"><%= _("Display settings") %></h2>
<% end %>
<%= form_tag :action => 'update' do %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/settings/feedback.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-settings"><%= _("Feedback settings") %></h2>
<i class="icon-large icon-settings"></i><h2 class="page-title"><%= _("Feedback settings") %></h2>
<% end %>
<%= form_tag :action => 'update' do %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/admin/settings/index.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-settings"><%= _("General settings") %></h2>
<i class="icon-large icon-settings"></i><h2 class="page-title"><%= _("General settings") %></h2>
<% end %>
<%= form_tag :action => 'update' do %>
Expand All @@ -11,7 +11,7 @@
<div class='controls'>
<%= text_field(:setting, :blog_name, {:class => 'span6', :size => this_blog.blog_name.length })%>
</div>
</div>
</div>
<div class='control-group'>
<label class='control-label' for="setting_blog_subtitle"><%= _("Blog subtitle")%></label>
<div class='controls'>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/settings/update_database.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-settings"><%= _("Database migration") %></h2>
<i class="icon-large icon-settings"></i><h2 class="page-title"><%= _("Database migration") %></h2>
<% end %>

<div class='alert alert-message warning'>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/settings/write.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-settings"><%= _("Write") %></h2>
<i class="icon-large icon-settings"></i><h2 class="page-title"><%= _("Write") %></h2>
<% end %>
<%= form_tag :action => 'update' do %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/shared/destroy.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large"><%= _(@record.class.name) %></h2>
<i class="icon-large"></i><h2 class="page-title"><%= _(@record.class.name) %></h2>
<% end %>

<p><%= _("Are you sure you want to delete this %s?", _(@record.class.name.downcase))%></p>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/sidebar/index.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-sidebar"><%= _("Sidebar") %></h2>
<i class="icon-large icon-sidebar"></i><h2 class="page-title"><%= _("Sidebar") %></h2>
<% end %>

<p class='help-block'><%= _("Drag and drop to change the sidebar items displayed on this blog. To remove items from the sidebar just click 'remove'. Changes are saved immediately, but not activated until you click the 'Publish changes' button")%>.</p>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/tags/new.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-tags"><%= _("Manage tags") %></h2>
<i class="icon-large icon-tags"></i><h2 class="page-title"><%= _("Manage tags") %></h2>
<% end %>

<div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/themes/index.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-theme"><%= _("Choose a theme") %></h2>
<i class="icon-large icon-theme"></i><h2 class="page-title"><%= _("Choose a theme") %></h2>
<% end %>
<%- i = 0 %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/users/edit.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-user-add"><%= _("Edit User") %></h2>
<i class="icon-large icon-user-add"></i><h2 class="page-title"><%= _("Edit User") %></h2>
<% end %>
<%= form_tag :action=>"edit", :id => @user.id do %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/users/index.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-user"><%= _("Users") %></h2>
<i class="icon-large icon-user"></i><h2 class="page-title"><%= _("Users") %></h2>
<div class='pull-right'>
<%= link_to(_("New User"), {controller: 'users', action: 'new'}, id: 'dialog-link', class: 'btn btn-info') %>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/users/new.html.erb
@@ -1,5 +1,5 @@
<%- content_for :page_heading do %>
<h2 class="icon-large icon-user-add"><%= _("Add User") %></h2>
<i class="icon-large icon-user-add"></i><h2 class="page-title"><%= _("Add User") %></h2>
<% end %>
<%= form_tag :action=>"new" do %>
Expand Down
14 changes: 8 additions & 6 deletions public/stylesheets/administration_structure.css
Expand Up @@ -143,6 +143,7 @@ a.delete:focus {
background-image: none !important;
}

.page-title { display:inline-block }
/* Classes for menu icons */

.icon-articles {
Expand All @@ -152,8 +153,8 @@ a.delete:focus {
.icon-pages {
background-position: -408px -120px;
width: 16px;

}

.icon-notes {
background-position: -264px -24px;
}
Expand Down Expand Up @@ -183,11 +184,12 @@ a.delete:focus {
}

.icon-large {
background:transparent url("../images/admin/glyphicons-large.png") 24px 24px no-repeat;
height: 28px;
line-height: 28px;
vertical-align: text-bottom;
padding-left:28px;
background:#000 url("../images/admin/glyphicons-large.png") 24px 24px no-repeat;
height: 28px;
line-height: 28px;
vertical-align: text-bottom;
padding-left:28px;
display:inline-block;
}

.icon-large.icon-dashboard{ background-position: 0 -670px; }
Expand Down

0 comments on commit fc12a91

Please sign in to comment.