optimacms 0.1.41 → 0.1.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 541eefdc59f607b5c4571a0dc5a7e9a42270ce21
-  data.tar.gz: 157c3f4c91050b4d477eff86029a263237d2323f
+  metadata.gz: 13e485e5b7f4c1d834240a738c0de523621fb25d
+  data.tar.gz: 5234d954c777b4079f26116f28f1749f072e9d1a
 SHA512:
-  metadata.gz: fa652ca931f2e805a3d3995416c2e91b72234ae6cb68dd8f92f2bb150317d679fe0d904d9d2e76c5193a69b5c723a61e70b5806e1978bd20d751fefa767cb947
-  data.tar.gz: ee36effdf20837a3b70fa4dcfbcc3264c3389a7c5f92736a10207626597e868ce85983407cd329970ccacd21eb55b82517684050d954f178e7147818e68c39e5
+  metadata.gz: f54d548c81500ba0a6cfc26cd4e35c98a5ea3ca8e62e44f8c261091ab5962237480b982e024b37c67cd5c86649856b16eb9a16aa1d5c6aa8f9e0c43faa5d9bca
+  data.tar.gz: 5608442eeca49eb360b4bbdf56a28b402128b0bf697f909b3f11a67d8ba879469ffac3dc360a98afbb05fa1cf0280bdfecd6be302d7a8ed5f175b821dc560bc0

data/app/helpers/optimacms/application_helper.rb

@@ -15,10 +15,21 @@ module Optimacms
       '<pre>{{block:name:sub}}</pre>'
     end
 
+    def eval_meta_string(s)
+      eval('"'+s+'"')
+    end
+
+    def fix_quotes(s)
+      s.gsub /"/, '\"'
+    end
+
     def meta_tags(title=nil, keywords=nil, desc=nil)
-      title ||= eval('"'+@optimacms_meta_title+'"')
-      keywords ||= eval('"'+@optimacms_meta_keywords+'"')
-      desc ||= eval('"'+@optimacms_meta_description+'"')
+      s = 'news "11"'
+      s1 = s.gsub /"/, '\"'
+      s2 = eval('"'+s1+'"')
+      title ||= eval_meta_string(fix_quotes(@optimacms_meta_title))
+      keywords ||= eval_meta_string(@optimacms_meta_keywords)
+      desc ||= eval_meta_string(@optimacms_meta_description)
 
 
     return %(<title>#{title}</title>

data/app/views/optimacms/admin/shared/_leftmenu.html.haml

@@ -14,7 +14,7 @@
       %li=link_to 'Pages', pages_path
       %li=link_to 'Templates', templates_path
       -#%li=link_to 'Layouts', layouts_path
-      %li=link_to 'Data Blocks - NOT WORK', 'datablocks_path'
+      -#%li=link_to 'Data Blocks - NOT WORK', 'datablocks_path'
       %li=link_to 'Media', mediafiles_path
 
   %li

data/lib/optimacms/version.rb

@@ -1,3 +1,3 @@
 module Optimacms
-  VERSION = "0.1.41"
+  VERSION = "0.1.43"
 end