EDIT / kanjai · Commits

Commit 60f81ffff93c45492ab320006e7f9a6d88c8dae7

Authored by Karpikau Andrei
1 parent 7432110c

check repeat variables

Inline Side-by-side
Showing 4 changed files with 70 additions and 21 deletions
@@ -97,28 +97,28 @@ @@ -97,28 +97,28 @@
97 <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false"> 97 <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">
98 <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb"> 98 <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
99 <provider selected="true" editor-type-id="text-editor"> 99 <provider selected="true" editor-type-id="text-editor">
100 - <state vertical-scroll-proportion="0.0" vertical-offset="2655" max-vertical-offset="4155"> 100 + <state vertical-scroll-proportion="0.0" vertical-offset="3521" max-vertical-offset="4155">
101 <caret line="199" column="54" selection-start-line="199" selection-start-column="54" selection-end-line="199" selection-end-column="54" /> 101 <caret line="199" column="54" selection-start-line="199" selection-start-column="54" selection-end-line="199" selection-end-column="54" />
102 <folding /> 102 <folding />
103 </state> 103 </state>
104 </provider> 104 </provider>
105 </entry> 105 </entry>
106 </file> 106 </file>
107 - <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">  
108 - <entry file="file://$PROJECT_DIR$/Gemfile"> 107 + <file leaf-file-name="pages_helper.rb" pinned="false" current-in-tab="false">
  108 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
109 <provider selected="true" editor-type-id="text-editor"> 109 <provider selected="true" editor-type-id="text-editor">
110 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">  
111 - <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" /> 110 + <state vertical-scroll-proportion="0.0" vertical-offset="735" max-vertical-offset="1995">
  111 + <caret line="53" column="62" selection-start-line="53" selection-start-column="62" selection-end-line="53" selection-end-column="62" />
112 <folding /> 112 <folding />
113 </state> 113 </state>
114 </provider> 114 </provider>
115 </entry> 115 </entry>
116 </file> 116 </file>
117 - <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">  
118 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb"> 117 + <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">
  118 + <entry file="file://$PROJECT_DIR$/Gemfile">
119 <provider selected="true" editor-type-id="text-editor"> 119 <provider selected="true" editor-type-id="text-editor">
120 - <state vertical-scroll-proportion="0.0" vertical-offset="251" max-vertical-offset="885">  
121 - <caret line="48" column="7" selection-start-line="48" selection-start-column="7" selection-end-line="48" selection-end-column="7" /> 120 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
  121 + <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
122 <folding /> 122 <folding />
123 </state> 123 </state>
124 </provider> 124 </provider>
@@ -129,7 +129,6 @@ @@ -129,7 +129,6 @@
129 <component name="IdeDocumentHistory"> 129 <component name="IdeDocumentHistory">
130 <option name="CHANGED_PATHS"> 130 <option name="CHANGED_PATHS">
131 <list> 131 <list>
132 - <option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" />  
133 <option value="$PROJECT_DIR$/app/views/kanjai/shared/_new_resource_links.html.erb" /> 132 <option value="$PROJECT_DIR$/app/views/kanjai/shared/_new_resource_links.html.erb" />
134 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/new.html.erb" /> 133 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/new.html.erb" />
135 <option value="$PROJECT_DIR$/app/views/kanjai/shared/_edit_resource_links.html.erb" /> 134 <option value="$PROJECT_DIR$/app/views/kanjai/shared/_edit_resource_links.html.erb" />
@@ -179,6 +178,7 @@ @@ -179,6 +178,7 @@
179 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" /> 178 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" />
180 <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" /> 179 <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" />
181 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" /> 180 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
  181 + <option value="$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb" />
182 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 182 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
183 </list> 183 </list>
184 </option> 184 </option>
@@ -348,6 +348,54 @@ @@ -348,6 +348,54 @@
348 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 348 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
349 </PATH_ELEMENT> 349 </PATH_ELEMENT>
350 <PATH_ELEMENT> 350 <PATH_ELEMENT>
  351 + <option name="myItemId" value="helpers" />
  352 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  353 + </PATH_ELEMENT>
  354 + <PATH_ELEMENT>
  355 + <option name="myItemId" value="kanjai" />
  356 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  357 + </PATH_ELEMENT>
  358 + </PATH>
  359 + <PATH>
  360 + <PATH_ELEMENT>
  361 + <option name="myItemId" value="kanjai" />
  362 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  363 + </PATH_ELEMENT>
  364 + <PATH_ELEMENT>
  365 + <option name="myItemId" value="kanjai" />
  366 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  367 + </PATH_ELEMENT>
  368 + <PATH_ELEMENT>
  369 + <option name="myItemId" value="app" />
  370 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  371 + </PATH_ELEMENT>
  372 + <PATH_ELEMENT>
  373 + <option name="myItemId" value="helpers" />
  374 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  375 + </PATH_ELEMENT>
  376 + <PATH_ELEMENT>
  377 + <option name="myItemId" value="kanjai" />
  378 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  379 + </PATH_ELEMENT>
  380 + <PATH_ELEMENT>
  381 + <option name="myItemId" value="admin" />
  382 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  383 + </PATH_ELEMENT>
  384 + </PATH>
  385 + <PATH>
  386 + <PATH_ELEMENT>
  387 + <option name="myItemId" value="kanjai" />
  388 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  389 + </PATH_ELEMENT>
  390 + <PATH_ELEMENT>
  391 + <option name="myItemId" value="kanjai" />
  392 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  393 + </PATH_ELEMENT>
  394 + <PATH_ELEMENT>
  395 + <option name="myItemId" value="app" />
  396 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  397 + </PATH_ELEMENT>
  398 + <PATH_ELEMENT>
351 <option name="myItemId" value="assets" /> 399 <option name="myItemId" value="assets" />
352 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 400 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
353 </PATH_ELEMENT> 401 </PATH_ELEMENT>
@@ -630,13 +678,6 @@ @@ -630,13 +678,6 @@
630 <watches-manager /> 678 <watches-manager />
631 </component> 679 </component>
632 <component name="editorHistoryManager"> 680 <component name="editorHistoryManager">
633 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/edit.html.erb">  
634 - <provider selected="true" editor-type-id="text-editor">  
635 - <state vertical-scroll-proportion="-6.875" vertical-offset="0" max-vertical-offset="360">  
636 - <caret line="11" column="111" selection-start-line="11" selection-start-column="111" selection-end-line="11" selection-end-column="111" />  
637 - </state>  
638 - </provider>  
639 - </entry>  
640 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_langs_controller.rb"> 681 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_langs_controller.rb">
641 <provider selected="true" editor-type-id="text-editor"> 682 <provider selected="true" editor-type-id="text-editor">
642 <state vertical-scroll-proportion="0.0" vertical-offset="394" max-vertical-offset="975"> 683 <state vertical-scroll-proportion="0.0" vertical-offset="394" max-vertical-offset="975">
@@ -1002,6 +1043,14 @@ @@ -1002,6 +1043,14 @@
1002 </state> 1043 </state>
1003 </provider> 1044 </provider>
1004 </entry> 1045 </entry>
  1046 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
  1047 + <provider selected="true" editor-type-id="text-editor">
  1048 + <state vertical-scroll-proportion="0.0" vertical-offset="735" max-vertical-offset="1995">
  1049 + <caret line="53" column="62" selection-start-line="53" selection-start-column="62" selection-end-line="53" selection-end-column="62" />
  1050 + <folding />
  1051 + </state>
  1052 + </provider>
  1053 + </entry>
1005 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 1054 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
1006 <provider selected="true" editor-type-id="text-editor"> 1055 <provider selected="true" editor-type-id="text-editor">
1007 <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634"> 1056 <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.23) 4 + kanjai (0.0.24)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -82,9 +82,9 @@ module Kanjai @@ -82,9 +82,9 @@ module Kanjai
82 end 82 end
83 83
84 84
85 - html = '<div class="container">' + html.to_s + '</div>' 85 + #html = '<div class="container">' + html.to_s + '</div>'
86 86
87 - html 87 + html.to_s
88 end 88 end
89 89
90 def make_navigation(parent_id, level) 90 def make_navigation(parent_id, level)
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.24" 2 + VERSION = "0.0.25"
3 end 3 end