optimacms 0.2.15 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d79819fa5e541fd1080c7128384c2004d0d792b
-  data.tar.gz: d87921eb9e0267d77d0a8d61ba3d201233135628
+  metadata.gz: 819c23d0db88c22546e3b511184f505a9c74e644
+  data.tar.gz: f719a1bfe376bee28abcf10a719905ded29d3629
 SHA512:
-  metadata.gz: 651fc5c6aae7e91ab90942d1afeb75d26ab333d9a8795bb5e4d58238789e5f55c02c5f05006cabbc1d155d11393e32338e0c707858e2da31c6a33508a64d4fb8
-  data.tar.gz: ce5cd91f00838724652c157609695e7ca169b01b06d1344b329695736146d1ccde003119b418be65e73a4c0f2146e138e41732a52c3caad4c260747cd3977629
+  metadata.gz: f6100425840df06842ea2ed3fccdfd78a774d0b84b6c6d594df1a2c6f139d8a018fdf8e1de85790b5cca276449d995c1f64406279fce6fe91f1d8cefea096dc9
+  data.tar.gz: d4491d189ce00626fd191c8bf56b2d2af208c42aae92dd7dafdf60c739870cb43eb08795813e811db16fb674ba7ba775e1465893b5397937e73a26b8f03f6e3b

data/app/models/optimacms/template.rb

@@ -307,6 +307,7 @@ module Optimacms
           self.parent = Template.create_folders_tree(self.basedirpath)
         end
 
+
       end
 
     end
@@ -341,6 +342,12 @@ module Optimacms
         # TODO: rename file
         #self.make_basepath
 
+        # remove translations if needed
+        if !self.is_translated
+          self.translations = self.translations.reject{|r| r.lang!=''}
+          #self.translations.clear
+
+        end
       end
 
     end

data/app/views/optimacms/admin/templates/_form_content_translation.html.haml

@@ -20,24 +20,26 @@
         - lang = tran.lang
         - name = lang=='' ? 'def' : lang
 
-
-        %div{id: "tab-content-#{lang}", class: ["tab-pane", ("active" if lang=='')], role: "tabpanel", data: {lang: lang}}
-          =ftran.input :item_id, as: :hidden, :readonly=>true
-          =ftran.input :lang, :readonly=>true
-          -#=ftran.input :content, label: 'Content'
-          - if @item.has_code?
-            .form-group
-              = ftran.input_field :content, as: :text, label: "Content", :rows => 16, :cols => 80, :class=>'form_input_content', :data=>{lang: name}
-
-              %div{id: "content-#{name}", class: '', data: {lang: name}}(style="width:100%; height: 600px; border: 2px #333333 solid;")
-
-          - else
-            .form-group
-              .col-sm-12.col-md-12.control
-                -#= ftran.input :content, as: :text, label: "Content", input_html: {:rows => 16, :cols => 120, :class=>'editor'}
-                = ftran.input_field :content, as: :text, label: "Content", rows: 16, cols: 120, class: 'editor', style: "min-height: 600px;"
-
-        .clearfix
+        - lang_ok = lang=='' || lang=='def' || @languages.include?(lang)
+
+        - if lang_ok
+          %div{id: "tab-content-#{lang}", class: ["tab-pane", ("active" if lang=='')], role: "tabpanel", data: {lang: lang}}
+            =ftran.input :item_id, as: :hidden, :readonly=>true
+            =ftran.input :lang, :readonly=>true
+            -#=ftran.input :content, label: 'Content'
+            - if @item.has_code?
+              .form-group
+                = ftran.input_field :content, as: :text, label: "Content", :rows => 16, :cols => 80, :class=>'form_input_content', :data=>{lang: name}
+
+                %div{id: "content-#{name}", class: '', data: {lang: name}}(style="width:100%; height: 600px; border: 2px #333333 solid;")
+
+            - else
+              .form-group
+                .col-sm-12.col-md-12.control
+                  -#= ftran.input :content, as: :text, label: "Content", input_html: {:rows => 16, :cols => 120, :class=>'editor'}
+                  = ftran.input_field :content, as: :text, label: "Content", rows: 16, cols: 120, class: 'editor', style: "min-height: 600px;"
+
+          .clearfix
 
       -# @languages.each do |lang|
         %div{id: "content-#{lang}", class: "tab-pane", role: "tabpanel"}

data/lib/optimacms/version.rb

@@ -1,3 +1,3 @@
 module Optimacms
-  VERSION = "0.2.15"
+  VERSION = "0.2.16"
 end

data/spec/dummy/app/views/temp/p1.html.haml

@@ -1,6 +1,6 @@
-include html:
-
-= block 'temp/h1'
-
-include haml:
-= block 'temp/part1'
+a1
+
+%hr
+%hr
+
+= block 'temp/t2'

data/spec/dummy/app/views/temp/t2.en.html.haml

@@ -0,0 +1 @@
+en-en-en

data/spec/dummy/app/views/temp/t2.html.haml

@@ -0,0 +1 @@
+def def def def def 

data/spec/dummy/app/views/temp/t2.ru.html.haml

@@ -0,0 +1 @@
+ru-ru-ru-