EDIT / kanjai · Commits

Commit 0f2cfdd0b11d96ccdfb5821352a21ea1c524fe33

Authored by Karpikau Andrei
1 parent 8b482486

delete cache from private page, correct show title in menu

Inline Side-by-side
Showing 5 changed files with 276 additions and 144 deletions
... ... @@ -28,113 +28,105 @@
28 28 <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
29 29 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
30 30 <provider selected="true" editor-type-id="text-editor">
31   - <state vertical-scroll-proportion="0.036057692" vertical-offset="0" max-vertical-offset="416">
  31 + <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
32 32 <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
33 33 <folding />
34 34 </state>
35 35 </provider>
36 36 </entry>
37 37 </file>
38   - <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
39   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  38 + <file leaf-file-name="html_editor.js" pinned="false" current-in-tab="false">
  39 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
40 40 <provider selected="true" editor-type-id="text-editor">
41   - <state vertical-scroll-proportion="0.0" vertical-offset="1212" max-vertical-offset="2565">
42   - <caret line="92" column="57" selection-start-line="92" selection-start-column="57" selection-end-line="92" selection-end-column="57" />
43   - <folding />
  41 + <state vertical-scroll-proportion="-10.814815" vertical-offset="1898" max-vertical-offset="5490">
  42 + <caret line="146" column="54" selection-start-line="146" selection-start-column="35" selection-end-line="146" selection-end-column="54" />
  43 + <folding>
  44 + <marker date="1461763907000" expanded="true" signature="2474:2516" placeholder="..." />
  45 + <marker date="1461763907000" expanded="true" signature="4297:4315" placeholder="..." />
  46 + <marker date="1461763907000" expanded="true" signature="4329:4347" placeholder="..." />
  47 + <marker date="1461763907000" expanded="true" signature="4399:4409" placeholder="..." />
  48 + <marker date="1461763907000" expanded="true" signature="4436:4499" placeholder="..." />
  49 + </folding>
44 50 </state>
45 51 </provider>
46 52 </entry>
47 53 </file>
48   - <file leaf-file-name="_operation.html.erb" pinned="false" current-in-tab="false">
49   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_operation.html.erb">
  54 + <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">
  55 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
50 56 <provider selected="true" editor-type-id="text-editor">
51   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
52   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  57 + <state vertical-scroll-proportion="0.0" vertical-offset="1290" max-vertical-offset="4395">
  58 + <caret line="118" column="109" selection-start-line="118" selection-start-column="109" selection-end-line="118" selection-end-column="109" />
53 59 <folding />
54 60 </state>
55 61 </provider>
56 62 </entry>
57 63 </file>
58   - <file leaf-file-name="_preview.html.erb" pinned="false" current-in-tab="false">
59   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_preview.html.erb">
  64 + <file leaf-file-name="page.rb" pinned="false" current-in-tab="false">
  65 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
60 66 <provider selected="true" editor-type-id="text-editor">
61   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="195">
62   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  67 + <state vertical-scroll-proportion="-7.4814816" vertical-offset="728" max-vertical-offset="1410">
  68 + <caret line="62" column="33" selection-start-line="62" selection-start-column="24" selection-end-line="62" selection-end-column="33" />
63 69 <folding />
64 70 </state>
65 71 </provider>
66 72 </entry>
67 73 </file>
68   - <file leaf-file-name="structure.html.erb" pinned="false" current-in-tab="false">
69   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/structure.html.erb">
  74 + <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">
  75 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
70 76 <provider selected="true" editor-type-id="text-editor">
71   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="675">
72   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  77 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1035">
  78 + <caret line="32" column="24" selection-start-line="32" selection-start-column="6" selection-end-line="32" selection-end-column="24" />
73 79 <folding />
74 80 </state>
75 81 </provider>
76 82 </entry>
77 83 </file>
78   - <file leaf-file-name="show_editor.html.erb" pinned="false" current-in-tab="false">
79   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb">
  84 + <file leaf-file-name="frontend.js" pinned="false" current-in-tab="false">
  85 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
80 86 <provider selected="true" editor-type-id="text-editor">
81   - <state vertical-scroll-proportion="0.0" vertical-offset="90" max-vertical-offset="615">
82   - <caret line="6" column="61" selection-start-line="6" selection-start-column="47" selection-end-line="6" selection-end-column="61" />
83   - <folding>
84   - <element signature="e#360#414#0#ruby" expanded="false" />
85   - <element signature="e#1122#1141#0#ruby" expanded="false" />
86   - <element signature="e#1197#1216#0#ruby" expanded="false" />
87   - </folding>
  87 + <state vertical-scroll-proportion="0.0" vertical-offset="109" max-vertical-offset="540">
  88 + <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="28" />
  89 + <folding />
88 90 </state>
89 91 </provider>
90 92 </entry>
91 93 </file>
92   - <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
93   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
  94 + <file leaf-file-name="frontend_extend.js" pinned="false" current-in-tab="false">
  95 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_extend.js">
94 96 <provider selected="true" editor-type-id="text-editor">
95   - <state vertical-scroll-proportion="0.0" vertical-offset="1118" max-vertical-offset="4275">
96   - <caret line="99" column="45" selection-start-line="99" selection-start-column="45" selection-end-line="99" selection-end-column="45" />
97   - <folding>
98   - <element signature="e#2689#2725#0" expanded="true" />
99   - <element signature="e#2768#2808#0" expanded="true" />
100   - </folding>
  97 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  98 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  99 + <folding />
101 100 </state>
102 101 </provider>
103 102 </entry>
104 103 </file>
105   - <file leaf-file-name="add_item.html.erb" pinned="false" current-in-tab="false">
106   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_contents/add_item.html.erb">
  104 + <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
  105 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
107 106 <provider selected="true" editor-type-id="text-editor">
108   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="810">
109   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  107 + <state vertical-scroll-proportion="0.0" vertical-offset="90" max-vertical-offset="2565">
  108 + <caret line="20" column="71" selection-start-line="20" selection-start-column="71" selection-end-line="20" selection-end-column="71" />
110 109 <folding />
111 110 </state>
112 111 </provider>
113 112 </entry>
114 113 </file>
115   - <file leaf-file-name="_content.html.erb" pinned="false" current-in-tab="false">
116   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
  114 + <file leaf-file-name="edit.html.erb" pinned="false" current-in-tab="false">
  115 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/edit.html.erb">
117 116 <provider selected="true" editor-type-id="text-editor">
118   - <state vertical-scroll-proportion="0.0" vertical-offset="360" max-vertical-offset="1470">
119   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  117 + <state vertical-scroll-proportion="-10.625" vertical-offset="60" max-vertical-offset="660">
  118 + <caret line="21" column="100" selection-start-line="21" selection-start-column="81" selection-end-line="21" selection-end-column="100" />
120 119 <folding />
121 120 </state>
122 121 </provider>
123 122 </entry>
124 123 </file>
125   - <file leaf-file-name="_form.html.erb" pinned="false" current-in-tab="false">
126   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_form.html.erb">
  124 + <file leaf-file-name="page_templates_controller.rb" pinned="false" current-in-tab="false">
  125 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_templates_controller.rb">
127 126 <provider selected="true" editor-type-id="text-editor">
128   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="615">
129   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
130   - <folding>
131   - <element signature="e#54#97#0#ruby" expanded="false" />
132   - <element signature="e#404#443#0#ruby" expanded="false" />
133   - <element signature="e#640#677#0#ruby" expanded="false" />
134   - <element signature="e#878#921#0#ruby" expanded="false" />
135   - <element signature="n#t('admin.pages.type_page.html')#0;n#!!top" expanded="false" />
136   - <element signature="n#t('admin.pages.type_page.markdown')#0;n#!!top" expanded="false" />
137   - </folding>
  127 + <state vertical-scroll-proportion="-8.851851" vertical-offset="1261" max-vertical-offset="1650">
  128 + <caret line="100" column="144" selection-start-line="100" selection-start-column="6" selection-end-line="100" selection-end-column="144" />
  129 + <folding />
138 130 </state>
139 131 </provider>
140 132 </entry>
... ... @@ -183,7 +175,6 @@
183 175 <option value="$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb" />
184 176 <option value="$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb" />
185 177 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb" />
186   - <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
187 178 <option value="$PROJECT_DIR$/config/locales/en.yml" />
188 179 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/extend/test.js" />
189 180 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" />
... ... @@ -194,6 +185,7 @@
194 185 <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" />
195 186 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
196 187 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
  188 + <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
197 189 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
198 190 </list>
199 191 </option>
... ... @@ -292,6 +284,124 @@
292 284 <option name="myItemId" value="app" />
293 285 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
294 286 </PATH_ELEMENT>
  287 + <PATH_ELEMENT>
  288 + <option name="myItemId" value="views" />
  289 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  290 + </PATH_ELEMENT>
  291 + </PATH>
  292 + <PATH>
  293 + <PATH_ELEMENT>
  294 + <option name="myItemId" value="kanjai" />
  295 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  296 + </PATH_ELEMENT>
  297 + <PATH_ELEMENT>
  298 + <option name="myItemId" value="kanjai" />
  299 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  300 + </PATH_ELEMENT>
  301 + <PATH_ELEMENT>
  302 + <option name="myItemId" value="app" />
  303 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  304 + </PATH_ELEMENT>
  305 + <PATH_ELEMENT>
  306 + <option name="myItemId" value="views" />
  307 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  308 + </PATH_ELEMENT>
  309 + <PATH_ELEMENT>
  310 + <option name="myItemId" value="kanjai" />
  311 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  312 + </PATH_ELEMENT>
  313 + </PATH>
  314 + <PATH>
  315 + <PATH_ELEMENT>
  316 + <option name="myItemId" value="kanjai" />
  317 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  318 + </PATH_ELEMENT>
  319 + <PATH_ELEMENT>
  320 + <option name="myItemId" value="kanjai" />
  321 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  322 + </PATH_ELEMENT>
  323 + <PATH_ELEMENT>
  324 + <option name="myItemId" value="app" />
  325 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  326 + </PATH_ELEMENT>
  327 + <PATH_ELEMENT>
  328 + <option name="myItemId" value="views" />
  329 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  330 + </PATH_ELEMENT>
  331 + <PATH_ELEMENT>
  332 + <option name="myItemId" value="kanjai" />
  333 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  334 + </PATH_ELEMENT>
  335 + <PATH_ELEMENT>
  336 + <option name="myItemId" value="admin" />
  337 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  338 + </PATH_ELEMENT>
  339 + </PATH>
  340 + <PATH>
  341 + <PATH_ELEMENT>
  342 + <option name="myItemId" value="kanjai" />
  343 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  344 + </PATH_ELEMENT>
  345 + <PATH_ELEMENT>
  346 + <option name="myItemId" value="kanjai" />
  347 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  348 + </PATH_ELEMENT>
  349 + <PATH_ELEMENT>
  350 + <option name="myItemId" value="app" />
  351 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  352 + </PATH_ELEMENT>
  353 + <PATH_ELEMENT>
  354 + <option name="myItemId" value="views" />
  355 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  356 + </PATH_ELEMENT>
  357 + <PATH_ELEMENT>
  358 + <option name="myItemId" value="kanjai" />
  359 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  360 + </PATH_ELEMENT>
  361 + <PATH_ELEMENT>
  362 + <option name="myItemId" value="admin" />
  363 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  364 + </PATH_ELEMENT>
  365 + <PATH_ELEMENT>
  366 + <option name="myItemId" value="page_templates" />
  367 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  368 + </PATH_ELEMENT>
  369 + </PATH>
  370 + <PATH>
  371 + <PATH_ELEMENT>
  372 + <option name="myItemId" value="kanjai" />
  373 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  374 + </PATH_ELEMENT>
  375 + <PATH_ELEMENT>
  376 + <option name="myItemId" value="kanjai" />
  377 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  378 + </PATH_ELEMENT>
  379 + <PATH_ELEMENT>
  380 + <option name="myItemId" value="app" />
  381 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  382 + </PATH_ELEMENT>
  383 + <PATH_ELEMENT>
  384 + <option name="myItemId" value="models" />
  385 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  386 + </PATH_ELEMENT>
  387 + <PATH_ELEMENT>
  388 + <option name="myItemId" value="kanjai" />
  389 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  390 + </PATH_ELEMENT>
  391 + </PATH>
  392 + <PATH>
  393 + <PATH_ELEMENT>
  394 + <option name="myItemId" value="kanjai" />
  395 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  396 + </PATH_ELEMENT>
  397 + <PATH_ELEMENT>
  398 + <option name="myItemId" value="kanjai" />
  399 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  400 + </PATH_ELEMENT>
  401 + <PATH_ELEMENT>
  402 + <option name="myItemId" value="app" />
  403 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  404 + </PATH_ELEMENT>
295 405 </PATH>
296 406 <PATH>
297 407 <PATH_ELEMENT>
... ... @@ -547,7 +657,7 @@
547 657 <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
548 658 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
549 659 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
550   - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32930514" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  660 + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
551 661 <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
552 662 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
553 663 <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
... ... @@ -587,34 +697,6 @@
587 697 <watches-manager />
588 698 </component>
589 699 <component name="editorHistoryManager">
590   - <entry file="file://$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb">
591   - <provider selected="true" editor-type-id="text-editor">
592   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="165">
593   - <caret line="2" column="47" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="47" />
594   - </state>
595   - </provider>
596   - </entry>
597   - <entry file="file://$PROJECT_DIR$/config/locales/de.yml">
598   - <provider selected="true" editor-type-id="text-editor">
599   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
600   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
601   - </state>
602   - </provider>
603   - </entry>
604   - <entry file="file://$PROJECT_DIR$/lib/tasks/kanjai_tasks.rake">
605   - <provider selected="true" editor-type-id="text-editor">
606   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="150">
607   - <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
608   - </state>
609   - </provider>
610   - </entry>
611   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/config/index.html.erb">
612   - <provider selected="true" editor-type-id="text-editor">
613   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">
614   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="6" selection-end-column="6" />
615   - </state>
616   - </provider>
617   - </entry>
618 700 <entry file="file://$PROJECT_DIR$/config/routes.rb">
619 701 <provider selected="true" editor-type-id="text-editor">
620 702 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="900">
... ... @@ -678,13 +760,6 @@
678 760 </state>
679 761 </provider>
680 762 </entry>
681   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
682   - <provider selected="true" editor-type-id="text-editor">
683   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="7155">
684   - <caret line="301" column="0" selection-start-line="301" selection-start-column="0" selection-end-line="301" selection-end-column="0" />
685   - </state>
686   - </provider>
687   - </entry>
688 763 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js">
689 764 <provider selected="true" editor-type-id="text-editor">
690 765 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
... ... @@ -721,13 +796,6 @@
721 796 </state>
722 797 </provider>
723 798 </entry>
724   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
725   - <provider selected="true" editor-type-id="text-editor">
726   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="540">
727   - <caret line="0" column="21" selection-start-line="0" selection-start-column="21" selection-end-line="0" selection-end-column="21" />
728   - </state>
729   - </provider>
730   - </entry>
731 799 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js">
732 800 <provider selected="true" editor-type-id="text-editor">
733 801 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
... ... @@ -756,13 +824,6 @@
756 824 </state>
757 825 </provider>
758 826 </entry>
759   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
760   - <provider selected="true" editor-type-id="text-editor">
761   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4395">
762   - <caret line="93" column="68" selection-start-line="93" selection-start-column="68" selection-end-line="93" selection-end-column="68" />
763   - </state>
764   - </provider>
765   - </entry>
766 827 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
767 828 <provider selected="true" editor-type-id="text-editor">
768 829 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
... ... @@ -788,13 +849,6 @@
788 849 <provider selected="true" editor-type-id="text-editor">
789 850 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2520">
790 851 <caret line="5" column="15" selection-start-line="5" selection-start-column="8" selection-end-line="5" selection-end-column="15" />
791   - </state>
792   - </provider>
793   - </entry>
794   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
795   - <provider selected="true" editor-type-id="text-editor">
796   - <state vertical-scroll-proportion="0.0" vertical-offset="378" max-vertical-offset="1035">
797   - <caret line="32" column="24" selection-start-line="32" selection-start-column="6" selection-end-line="32" selection-end-column="24" />
798 852 <folding />
799 853 </state>
800 854 </provider>
... ... @@ -806,14 +860,6 @@
806 860 </state>
807 861 </provider>
808 862 </entry>
809   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
810   - <provider selected="true" editor-type-id="text-editor">
811   - <state vertical-scroll-proportion="0.0" vertical-offset="210" max-vertical-offset="1410">
812   - <caret line="25" column="16" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="16" />
813   - <folding />
814   - </state>
815   - </provider>
816   - </entry>
817 863 <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
818 864 <provider selected="true" editor-type-id="text-editor">
819 865 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
... ... @@ -839,13 +885,7 @@
839 885 <provider selected="true" editor-type-id="text-editor">
840 886 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
841 887 <caret line="5" column="9" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="9" />
842   - </state>
843   - </provider>
844   - </entry>
845   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_extend.js">
846   - <provider selected="true" editor-type-id="text-editor">
847   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
848   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  888 + <folding />
849 889 </state>
850 890 </provider>
851 891 </entry>
... ... @@ -856,14 +896,6 @@
856 896 </state>
857 897 </provider>
858 898 </entry>
859   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
860   - <provider selected="true" editor-type-id="text-editor">
861   - <state vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="2745">
862   - <caret line="39" column="37" selection-start-line="39" selection-start-column="37" selection-end-line="39" selection-end-column="37" />
863   - <folding />
864   - </state>
865   - </provider>
866   - </entry>
867 899 <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb">
868 900 <provider selected="true" editor-type-id="text-editor">
869 901 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2250">
... ... @@ -946,6 +978,28 @@
946 978 </state>
947 979 </provider>
948 980 </entry>
  981 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
  982 + <provider selected="true" editor-type-id="text-editor">
  983 + <state vertical-scroll-proportion="0.0" vertical-offset="507" max-vertical-offset="22110">
  984 + <caret line="52" column="17" selection-start-line="52" selection-start-column="17" selection-end-line="52" selection-end-column="17" />
  985 + <folding />
  986 + </state>
  987 + </provider>
  988 + </entry>
  989 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
  990 + <provider selected="true" editor-type-id="text-editor">
  991 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="7155">
  992 + <caret line="301" column="0" selection-start-line="301" selection-start-column="0" selection-end-line="301" selection-end-column="0" />
  993 + <folding>
  994 + <marker date="1461307505000" expanded="true" signature="-1:-1" placeholder="..." />
  995 + <marker date="1461307505000" expanded="true" signature="-1:-1" placeholder="..." />
  996 + <marker date="1461307505000" expanded="true" signature="-1:-1" placeholder="..." />
  997 + <marker date="1461307505000" expanded="true" signature="-1:-1" placeholder="..." />
  998 + <marker date="1461307505000" expanded="true" signature="-1:-1" placeholder="..." />
  999 + </folding>
  1000 + </state>
  1001 + </provider>
  1002 + </entry>
949 1003 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
950 1004 <provider selected="true" editor-type-id="text-editor">
951 1005 <state vertical-scroll-proportion="0.0" vertical-offset="1118" max-vertical-offset="4275">
... ... @@ -957,17 +1011,95 @@
957 1011 </state>
958 1012 </provider>
959 1013 </entry>
  1014 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
  1015 + <provider selected="true" editor-type-id="text-editor">
  1016 + <state vertical-scroll-proportion="0.0" vertical-offset="90" max-vertical-offset="2745">
  1017 + <caret line="22" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
  1018 + <folding />
  1019 + </state>
  1020 + </provider>
  1021 + </entry>
  1022 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_templates_controller.rb">
  1023 + <provider selected="true" editor-type-id="text-editor">
  1024 + <state vertical-scroll-proportion="-8.851851" vertical-offset="1261" max-vertical-offset="1650">
  1025 + <caret line="100" column="144" selection-start-line="100" selection-start-column="6" selection-end-line="100" selection-end-column="144" />
  1026 + <folding />
  1027 + </state>
  1028 + </provider>
  1029 + </entry>
  1030 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
  1031 + <provider selected="true" editor-type-id="text-editor">
  1032 + <state vertical-scroll-proportion="0.0" vertical-offset="378" max-vertical-offset="1035">
  1033 + <caret line="32" column="24" selection-start-line="32" selection-start-column="6" selection-end-line="32" selection-end-column="24" />
  1034 + <folding />
  1035 + </state>
  1036 + </provider>
  1037 + </entry>
960 1038 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
961 1039 <provider selected="true" editor-type-id="text-editor">
962   - <state vertical-scroll-proportion="0.0" vertical-offset="1212" max-vertical-offset="2565">
963   - <caret line="92" column="57" selection-start-line="92" selection-start-column="57" selection-end-line="92" selection-end-column="57" />
  1040 + <state vertical-scroll-proportion="0.0" vertical-offset="90" max-vertical-offset="2565">
  1041 + <caret line="20" column="71" selection-start-line="20" selection-start-column="71" selection-end-line="20" selection-end-column="71" />
  1042 + <folding />
  1043 + </state>
  1044 + </provider>
  1045 + </entry>
  1046 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/edit.html.erb">
  1047 + <provider selected="true" editor-type-id="text-editor">
  1048 + <state vertical-scroll-proportion="-10.625" vertical-offset="60" max-vertical-offset="660">
  1049 + <caret line="21" column="100" selection-start-line="21" selection-start-column="81" selection-end-line="21" selection-end-column="100" />
  1050 + <folding />
  1051 + </state>
  1052 + </provider>
  1053 + </entry>
  1054 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_extend.js">
  1055 + <provider selected="true" editor-type-id="text-editor">
  1056 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  1057 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1058 + <folding />
  1059 + </state>
  1060 + </provider>
  1061 + </entry>
  1062 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
  1063 + <provider selected="true" editor-type-id="text-editor">
  1064 + <state vertical-scroll-proportion="0.0" vertical-offset="109" max-vertical-offset="540">
  1065 + <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="28" />
  1066 + <folding />
  1067 + </state>
  1068 + </provider>
  1069 + </entry>
  1070 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
  1071 + <provider selected="true" editor-type-id="text-editor">
  1072 + <state vertical-scroll-proportion="-10.814815" vertical-offset="1898" max-vertical-offset="5490">
  1073 + <caret line="146" column="54" selection-start-line="146" selection-start-column="35" selection-end-line="146" selection-end-column="54" />
  1074 + <folding>
  1075 + <marker date="1461763907000" expanded="true" signature="2474:2516" placeholder="..." />
  1076 + <marker date="1461763907000" expanded="true" signature="4297:4315" placeholder="..." />
  1077 + <marker date="1461763907000" expanded="true" signature="4329:4347" placeholder="..." />
  1078 + <marker date="1461763907000" expanded="true" signature="4399:4409" placeholder="..." />
  1079 + <marker date="1461763907000" expanded="true" signature="4436:4499" placeholder="..." />
  1080 + </folding>
  1081 + </state>
  1082 + </provider>
  1083 + </entry>
  1084 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
  1085 + <provider selected="true" editor-type-id="text-editor">
  1086 + <state vertical-scroll-proportion="-7.4814816" vertical-offset="728" max-vertical-offset="1410">
  1087 + <caret line="62" column="33" selection-start-line="62" selection-start-column="24" selection-end-line="62" selection-end-column="33" />
  1088 + <folding />
  1089 + </state>
  1090 + </provider>
  1091 + </entry>
  1092 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  1093 + <provider selected="true" editor-type-id="text-editor">
  1094 + <state vertical-scroll-proportion="0.0" vertical-offset="1290" max-vertical-offset="4395">
  1095 + <caret line="118" column="109" selection-start-line="118" selection-start-column="109" selection-end-line="118" selection-end-column="109" />
964 1096 <folding />
965 1097 </state>
966 1098 </provider>
967 1099 </entry>
968 1100 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
969 1101 <provider selected="true" editor-type-id="text-editor">
970   - <state vertical-scroll-proportion="0.036057692" vertical-offset="0" max-vertical-offset="416">
  1102 + <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
971 1103 <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
972 1104 <folding />
973 1105 </state>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.47)
  4 + kanjai (0.0.48)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ...
... ... @@ -18,7 +18,7 @@ module Kanjai
18 18 end
19 19 #look - exist template or not for page
20 20 if @page_data.page.page_template
21   - if current_admin_user
  21 + if current_admin_user || @page_data.page.private_flag == true
22 22 layer = @page_data.page.page_template.get_html_content
23 23 content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data)
24 24 render :text => content_for_render and return
... ...
... ... @@ -111,12 +111,12 @@ module Kanjai
111 111 if $url == page.lang_attributes(I18n.locale, :url)
112 112 if active_state_template.present?
113 113 subparts << active_state_template.gsub('###link###', page.menu_url($scheme, lang = nil))
114   - .gsub('###title###', page.lang_attributes(PageLang.default, :title))
  114 + .gsub('###title###', page.lang_attributes(I18n.locale, :title))
115 115 end
116 116 else
117 117 if normal_state_template.present?
118 118 subparts << normal_state_template.gsub('###link###', page.menu_url($scheme, lang = nil))
119   - .gsub('###title###', page.lang_attributes(PageLang.default, :title))
  119 + .gsub('###title###', page.lang_attributes(I18n.locale, :title))
120 120 end
121 121 end
122 122
... ...
1 1 module Kanjai
2   - VERSION = "0.0.48"
  2 + VERSION = "0.0.49"
3 3 end
... ...