nodes 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34f5bded5d0ca6a250d26f477b32790235444a91
-  data.tar.gz: adde4ef5a54b3de4dd6b7e1b778ab367dcc6ca6b
+  metadata.gz: 7927d025156a63c898b9276a74e96d794ddb2939
+  data.tar.gz: 8bec6da808f21964e21e9913cc7b450f9cf4a8f1
 SHA512:
-  metadata.gz: 0d5675384746196fb967559bffb6dfc35ab8f28a31b1ed66fc70432784761da935b4c78c727159108ba6bf3fa96034dd8d7952020a236a087ef57611e3466f9e
-  data.tar.gz: 1b3ac25b6eff4da34b9cb22c11e2c812a3e8a0aa5a0b0d14eddac54e3f7ebe003099ac97d9cc045d037d14c67de36c5f89c90fd6aa6a8cec0c1dd4468d53bde5
+  metadata.gz: 8cf53cb9eb9dec144d7b800dc7c4788ea818ff58f6b856ad995bef994775c3f3197a93a93d487c9b9051bec55f8ded2fde109fe1175db67200e2d79bafd49b02
+  data.tar.gz: c03f70d5b478972b8c641cf79b74431d70436dd6d77c9596a8c88a41ad7cd6abc163ada1f909bb7509469d2a7ec488d3ec0dda928919c72552f860485547ae6b

data/app/assets/stylesheets/nodes/nodes.scss

@@ -1,6 +1,11 @@
 $nodes-font-size: 13px;
 $nodes-text-color: #555;
+$nodes-error-color: #a55;
+$nodes-notice-color: #5a5;
+$nodes-alert-color: #a55;
 $nodes-table-border: #ddd;
+$nodes-field-size: 800px;
+$nodes-text-height: 600px;
 
 /*==================================================== Global ========================================================*/
 
@@ -18,10 +23,34 @@ html, body {
   margin: 0;
   padding: 0;
 }
+h1 {
+  float: left;
+  clear: both;
+  font-weight: bold;
+  font-size: 26px;
+  margin: 10px 0 0 0;
+  padding: 0;
+}
+h2 {
+  float: left;
+  clear: both;
+  font-weight: bold;
+  font-size: 22px;
+  margin: 10px 0 0 0;
+  padding: 0;
+}
+h3 {
+  float: left;
+  clear: both;
+  font-weight: bold;
+  font-size: 18px;
+  margin: 10px 0 0 0;
+  padding: 0;
+}
 
 div {
-  display: block;
   float: left;
+  display: block;
 }
 
 table {
@@ -44,10 +73,28 @@ a {
   color: $nodes-text-color;
   font-weight: bold;
 }
+
 a:hover {
   text-decoration: underline;
 }
 
+.flash {
+  float: left;
+  clear: both;
+  #notice {
+    color: $nodes-notice-color;
+  }
+  #alert {
+    color: $nodes-alert-color;
+  }
+}
+
+
+.back {
+  float: left;
+  clear: both;
+}
+
 table.nodes-list {
   float: left;
   clear: both;
@@ -60,6 +107,170 @@ table.nodes-list {
 }
 
 a.nodes-action {
+  float: left;
+  clear: both;
   width: 20px;
   height: 20px;
 }
+
+.node-form {
+  float: left;
+  clear: both;
+  width: $nodes-field-size;
+  .actions {
+    padding-top: 5px;
+    margin-right: -7px;
+    float: right;
+    clear: both;
+  }
+  #node_name {
+    width: $nodes-field-size;
+  }
+  #node_title {
+    width: $nodes-field-size;
+  }
+  #node_tag_list {
+    width: $nodes-field-size;
+  }
+  #node_file {
+    width: $nodes-field-size;
+  }
+  #node_text {
+    width: $nodes-field-size;
+    height: $nodes-text-height;
+  }
+  .field_with_errors {
+    input, select {
+      float: left;
+      border: 1px solid $nodes-error-color;
+    }
+  }
+  #error_explanation {
+    h2 {
+      font-size: 2+$nodes-font-size;
+      color: $nodes-error-color;
+    }
+  }
+  ul {
+    list-style: none;
+    padding: 0 0 10px 0;
+    margin: 0;
+  }
+  li {
+    padding-left: 5px;
+    padding-bottom: 5px;
+    text-indent: -3px;
+    color: $nodes-error-color;
+  }
+  li::before {
+    content: '• ';
+    color: $nodes-error-color;
+  }
+}
+
+.node {
+  float: left;
+  clear: both;
+  margin: 0px;
+  a {
+    color: $nodes-text-color;
+    text-decoration: none;
+    font-weight: bold;
+  }
+  a:hover {
+    text-decoration: underline;
+  }
+  .date {
+    float: left;
+    clear: both;
+    margin-top: 5px;
+  }
+  .author {
+    float: left;
+    clear: both;
+    font-size: 18px;
+    margin-top: 10px;
+  }
+  .title {
+    float: left;
+    clear: both;
+    margin-top: 10px;
+  }
+  .tags {
+    float: left;
+    clear: both;
+    margin-top: 10px;
+    a {
+      margin-right: 3px;
+    }
+  }
+  .text {
+    float: left;
+    clear: both;
+    margin-top: 10px;
+    .audio {
+      float: left;
+      margin-top: 5px;
+      clear: both;
+      width: 300px;
+    }
+    .image {
+      float: left;
+      clear: both;
+      margin-top: 5px;
+      img {
+        float: left;
+        margin: 3px;
+        clear: both;
+      }
+    }
+    .name {
+      float: left;
+      clear: both;
+      width: 100%;
+      font-size: 12px;
+      text-align: center;
+    }
+    .image.right {
+      float: right;
+    }
+  }
+  p {
+    float: left;
+    clear: both;
+    padding: 0;
+    margin: 10px 0 0 0;
+    font-size: 15px;
+  }
+  p.aright {
+    float: right;
+  }
+  ul {
+    float: left;
+    clear: both;
+    padding: 0;
+    margin: 0px 0px 0px 20px;
+    font-size: 15px;
+    li {
+      margin: 0px;
+      padding: 0px;
+    }
+  }
+  .user {
+    float: left;
+    clear: both;
+    margin-top: 10px;
+  }
+  .email {
+    float: left;
+    clear: both;
+    margin-top: 10px;
+  }
+  pre {
+    float: left;
+  }
+  code {
+    color: grey;
+  }
+}
+

data/app/controllers/nodes/nodes_controller.rb

@@ -22,7 +22,7 @@ module Nodes
       @node = Node.new(node_params)
 
       if @node.save
-        redirect_to @node, notice: 'Node was successfully created.'
+        redirect_to @node, notice: I18n.t(:node_was_created)
       else
         render :new
       end
@@ -30,7 +30,7 @@ module Nodes
 
     def update
       if @node.update(node_params)
-        redirect_to @node, notice: 'Node was successfully updated.'
+        redirect_to @node, notice: I18n.t(:node_was_updated)
       else
         render :edit
       end
@@ -38,7 +38,7 @@ module Nodes
 
     def destroy
       @node.destroy
-      redirect_to nodes_url, notice: 'Node was successfully destroyed.'
+      redirect_to nodes_url, notice: I18n.t(:node_was_destroyed)
     end
 
     private

data/app/helpers/nodes/application_helper.rb

@@ -1,4 +1,21 @@
 module Nodes
   module ApplicationHelper
+    def form_error(o)
+      if o.errors.any?
+        haml_tag :div, :id => 'error_explanation' do
+          haml_tag :h2 do
+            haml_concat t(:error_save)
+          end
+          haml_tag :ul do
+            o.errors.full_messages.each do |msg|
+              haml_tag :li do
+                haml_concat msg
+              end
+            end
+          end
+        end
+      end
+    end
+
   end
 end

data/app/views/layouts/nodes/application.haml

@@ -9,8 +9,10 @@
 
   %body
     .flash
-      .notice= flash[:notice]
-      .alert= flash[:alert]
+      - if flash[:notice]
+        #notice= flash[:notice]
+      - if flash[:alert]
+        #alert= flash[:alert]
 
     -#%div{style: 'position:relative;height:0;padding-bottom:80.21%'}
       %iframe{ src: "https://www.youtube.com/embed/2Oy2LVaGPGE?ecver=2",

data/app/views/nodes/nodes/_form.haml

@@ -1,13 +1,4 @@
-= form_for @node do |f|
-  - if @node.errors.any?
-    #error_explanation
-      %h2= "#{pluralize(@node.errors.count, "error")} prohibited this node from being saved:"
-      %ul
-        - @node.errors.full_messages.each do |message|
-          %li= message
-
-  .field
-    = f.label :name
-    = f.text_field :name
-  .actions
-    = f.submit 'Save'
+= form_for @node, :html => {:class => 'node-form'} do |f|
+  - form_error @node
+  .field= f.text_field :name
+  .actions= image_submit_tag('nodes/save.png', :title => t(:save_node) )

data/app/views/nodes/nodes/edit.haml

@@ -1,7 +1,4 @@
-%h1 Editing node
-
+%h1= t(:edit_node)
 = render 'form'
-
-= link_to 'Show', @node
-\|
-= link_to 'Back', nodes_path
+-#.back= link_to @node.name,  @node
+.back= link_to t(:nodes), nodes_path

data/app/views/nodes/nodes/index.haml

@@ -13,7 +13,7 @@
     - @nodes.each do |node|
       %tr
       -#%td= l(node.date, :format=>:long)
-      %td= link_to node.name,  edit_node_path # "/entry/#{entry.title}"
+      %td= link_to node.name,  node # "/entry/#{entry.title}"
       -#%td
       -#  - entry.tags.each do |tag|
       -#    =link_to tag, tag_path(tag)

data/app/views/nodes/nodes/new.haml

@@ -1,5 +1,3 @@
-%h1 New node
-
+%h1= t(:new_node)
 = render 'form'
-
-= link_to 'Back', nodes_path
+.back= link_to t(:nodes), nodes_path

data/app/views/nodes/nodes/show.haml

@@ -1,9 +1,28 @@
-%p#notice= notice
+.node
+  %h1= link_to @node.name, edit_node_path(@node)
+.back= link_to t(:nodes), nodes_path
 
-%p
-  %b Name:
-  = @node.name
+-#.entry
+  - if @entry
+    .date= l(@entry.date, :format=>:long)
+    .tags
+      - @entry.tags.each do |tag|
+        =link_to tag, tag_path(tag)
+    - if @entry.author
+      .author= @entry.author
+    .title
+      - if User.logged?(session)
+        %h1= link_to @entry.name, edit_entry_path(@entry)
+      - else
+        %h1= @entry.name
+    .text= @entry.format.html_safe
+    -#.text= @entry.html
+  - else
+    .text No entry
+  .user
+    = link_to @entry.user.name, @entry.user
+  .email
+    = mail_to @entry.user.email
 
-= link_to 'Edit', edit_node_path(@node)
-\|
-= link_to 'Back', nodes_path
+
+-#.line= link_to Entry::Entry.model_name.human.pluralize, entries_path

data/config/locales/en.yml

@@ -2,6 +2,13 @@ en:
   nodes: nodes
   add_new_node: add new node
   sort_by_name: sort by name
+  new_node: new node
+  edit_node: editing node
+  save_node: save node
+  error_save: this node can not be saved due errors
+  node_was_created: node was successfully created
+  node_was_updated: node was successfully updated
+  node_was_destroyed: node was successfully destroyed
 
   activerecord:
     models:

data/config/locales/ru.yml

@@ -2,6 +2,13 @@ ru:
   nodes: nodes
   add_new_node: добавить новый узел
   sort_by_name: отсортировать по имени
+  new_node: новый узел
+  edit_node: редактироване узла
+  save_node: сохранить узел
+  error_save: этот узел не может быть сохранен из-за ошибок
+  node_was_created: узел был успешно создан
+  node_was_updated: узел был успешно обновлен
+  node_was_destroyed: узел был успешно удален
 
   activerecord:
     models:

data/lib/nodes/engine.rb

@@ -1,10 +1,10 @@
 module Nodes
   class Engine < ::Rails::Engine
     isolate_namespace Nodes
-    # routes.draw do
-    #   root to: 'nodes#index'
-    #   # mount Common::Engine => '/'
-    # end
+    routes.draw do
+      root to: 'nodes#index'
+      # mount Common::Engine => '/'
+    end
     config.generators do |g|
       g.test_framework :rspec, :fixture => false
       g.fixture_replacement :factory_girl, :dir => 'spec/factories'
@@ -13,8 +13,8 @@ module Nodes
     end
     initializer 'nodes.assets.precompile' do |app|
       app.config.assets.precompile +=
-          %w( nodes/nodes.coffee nodes/nodes.scss
-            nodes/create.png nodes/favicon.ico)
+          %w( nodes/nodes.coffee nodes/nodes.scss nodes/favicon.ico
+            nodes/create.png nodes/save.png)
     end
   end
 end

data/lib/nodes/version.rb

@@ -1,3 +1,3 @@
 module Nodes
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end