fixes and styling upgrades

2012-03-25 14:38:59 +02:00
parent 4c72fb10a1
commit a18d1bd646
187 changed files with 27 additions and 48257 deletions
@@ -41,7 +41,10 @@ a
        margin-right: 10px
        padding: 3px 6px
        +border-bottom-radius(5px)
+        a
+          color: white
  #title-container
+    margin-top: 12px
    @include linear-gradient(#aaa, #fff)
    padding: 10px
    +border-top-radius(15px)
@@ -1,5 +1,5 @@
 #user-info
-  #user-info-email= current_user.email
+  #user-info-email= link_to current_user.email, cmtool.user_path(current_user)
  #user-info-sign-in-out{class: user_signed_in? ? 'signed-in' : 'signed-out'}
    - if user_signed_in?
      = link_to t('devise.sessions.sign_out'), cmtool.destroy_user_session_path
@@ -4,5 +4,5 @@
 - content_for :page_links do
  %ul
    %li= link_to link_to_show_content(@contact_form), cmtool.contact_form_path(@contact_form)
-    %li= link_separator
+
    %li= link_to link_to_index_content(Cmtool::ContactForm), cmtool.contact_forms_path
@@ -18,5 +18,5 @@
 - content_for :page_links do
  %ul
    %li= link_to link_to_edit_content(@contact_form), cmtool.edit_contact_form_path(@contact_form)
-    %li= link_separator
+
    %li= link_to link_to_index_content(Cmtool::ContactForm), cmtool.contact_forms_path
@@ -4,5 +4,5 @@
 - content_for :page_links do
  %ul
    %li= link_to link_to_show_content(@directory), cmtool.directory_path(@directory)
-    %li= link_separator
+
    %li= link_to link_to_index_content(Cmtool::Directory), cmtool.directories_path
@@ -27,9 +27,9 @@
  %ul
    - if @directory.parent
      %li= link_to '..', cmtool.directory_path(@directory.parent)
-      %li= link_separator
+
    %li= link_to link_to_edit_content(@directory), cmtool.edit_directory_path(@directory)
-    %li= link_separator
+
    %li= link_to link_to_index_content(Cmtool::Directory), cmtool.directories_path
-    %li= link_separator
+
    %li= link_to_function t('cmtool.directoy.add_file'), %|$('.add-image-container').dialog('open')|
@@ -4,5 +4,5 @@
 - content_for :page_links do
  %ul
    %li= link_to link_to_show_content(@faq), cmtool.faq_path(@faq)
-    %li= link_separator
+
    %li= link_to link_to_index_content(Cmtool::Faq), cmtool.faqs_path
@@ -9,5 +9,5 @@
 - content_for :page_links do
  %ul
    %li= link_to link_to_edit_content(@faq), cmtool.edit_faq_path(@faq)
-    %li= link_separator
+
    %li= link_to link_to_index_content(Cmtool::Faq), cmtool.faqs_path
@@ -4,5 +4,5 @@
 - content_for :page_links do
  %ul
    %li= link_to link_to_show_content(@image), cmtool.image_path(@image)
-    %li= link_separator
+
    %li= link_to link_to_index_content(Cmtool::Image), cmtool.images_path
@@ -1,3 +1,3 @@
-var tinyMCE::ImageList = new Array(
+var tinyMCEImageList = new Array(
    <%= Cmtool::Image.active.map{|i| %{['#{i.clean_name} (Origineel)', '#{i.file.url(:original)}'], ['#{i.clean_name} (Pagina)', '#{i.file.url(:page)}'], ['#{i.clean_name} (Medium)', '#{i.file.url(:medium)}'], ['#{i.clean_name} (Thumb)', '#{i.file.url(:thumb)}']}}.join(",\n") %>
 );
@@ -18,7 +18,7 @@
 - content_for :page_links do
  %ul
    %li= link_to link_to_edit_content(@image), cmtool.edit_image_path(@image)
-    %li= link_separator
+
    %li= link_to link_to_new_content(Cmtool::Image), cmtool.new_image_path, :class => %w[new image]
-    %li= link_separator
+
    %li= link_to link_to_index_content(Cmtool::Image), cmtool.images_path
@@ -4,5 +4,5 @@
 - content_for :page_links do
  %ul
    %li= link_to link_to_show_content(@keyword), cmtool.keyword_path(@keyword)
-    %li= link_separator
+
    %li= link_to link_to_index_content(Cmtool::Keyword), cmtool.keywords_path
@@ -6,5 +6,5 @@
 - content_for :page_links do
  %ul
    %li= link_to link_to_edit_content(@keyword), cmtool.edit_keyword_path(@keyword)
-    %li= link_separator
+
    %li= link_to link_to_index_content(Cmtool::Keyword), cmtool.keywords_path
@@ -6,5 +6,5 @@
 - content_for :page_links do
  %ul
    %li= link_to link_to_show_content(@news), cmtool.news_path(@news)
-    %li= link_separator
+
    %li= link_to link_to_index_content(Cmtool::News), cmtool.news_index_path
@@ -1,4 +1,4 @@
- title :new, Cmtool::News
+- title :show, Cmtool::News
 - if @news.image?
  #news-image-container
    = link_to image_tag(@news.image.url(:thumb)), @news.image.url
@@ -25,5 +25,5 @@
 - content_for :page_links do
  %ul
    %li= link_to link_to_edit_content(@news), cmtool.edit_news_path(@news)
-    %li= link_separator
+
    %li= link_to link_to_index_content(Cmtool::News), cmtool.news_index_path
@@ -4,5 +4,5 @@
 - content_for :page_links do
  %ul
    %li= link_to link_to_show_content(@newsletter_subscription), cmtool.newsletter_subscription_path(@newsletter_subscription)
-    %li= link_separator
+
    %li= link_to link_to_index_content(Cmtool::NewsletterSubscription), cmtool.newsletter_subscriptions_path
@@ -12,5 +12,5 @@
 - content_for :page_links do
  %ul
    %li= link_to link_to_edit_content(@newsletter_subscription), cmtool.edit_newsletter_subscription_path(@newsletter_subscription)
-    %li= link_separator
+
    %li= link_to link_to_index_content(Cmtool::NewsletterSubscription), cmtool.newsletter_subscriptions_path
@@ -4,5 +4,5 @@
 - content_for :page_links do
  %ul
    %li= link_to link_to_show_content(@quote), cmtool.quote_path(@quote)
-    %li= link_separator
+
    %li= link_to link_to_index_content(Cmtool::Quote), cmtool.quotes_path
@@ -22,5 +22,5 @@
 - content_for :page_links do
  %ul
    %li= link_to link_to_edit_content(@quote), cmtool.edit_quote_path(@quote)
-    %li= link_separator
+
    %li= link_to link_to_index_content(Cmtool::Quote), cmtool.quotes_path
@@ -4,5 +4,5 @@
 - content_for :page_links do
  %ul
    %li= link_to link_to_show_content(@user), cmtool.user_path(@user)
-    %li= link_separator
+
    %li= link_to link_to_index_content(User), cmtool.users_path
@@ -34,5 +34,5 @@
 - content_for :page_links do
  %ul
    %li= link_to link_to_edit_content(@user), cmtool.edit_user_path(@user)
-    %li= link_separator
+
    %li= link_to link_to_index_content(User), cmtool.users_path
--- a/Show More
+++ b/Show More