explainable version

diff --git a/Portal.iml b/Portal.iml
index 1daff52..7b83881 100644 (file)
--- a/Portal.iml
+++ b/Portal.iml
@@ -4,28 +4,6 @@
     <facet type="Grails" name="Grails">
       <configuration />
     </facet>
-    <facet type="web" name="GrailsWeb">
-      <configuration>
-        <webroots>
-          <root url="file://$MODULE_DIR$/web-app" relative="/" />
-        </webroots>
-        <sourceRoots />
-        <building>
-          <setting name="EXPLODED_URL" value="file://" />
-          <setting name="EXPLODED_ENABLED" value="false" />
-          <setting name="JAR_URL" value="file://" />
-          <setting name="JAR_ENABLED" value="false" />
-          <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" />
-        </building>
-      </configuration>
-    </facet>
-    <facet type="Spring" name="Spring">
-      <configuration>
-        <fileset id="Grails" name="Grails" removed="false">
-          <file>file://$MODULE_DIR$/web-app/WEB-INF/applicationContext.xml</file>
-        </fileset>
-      </configuration>
-    </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />

diff --git a/Portal.ipr b/Portal.ipr
index 53809ac..637795a 100644 (file)
--- a/Portal.ipr
+++ b/Portal.ipr
@@ -185,8 +185,6 @@
               <list size="0" />
             </value>
           </option>
-          <option name="ADD_EJB_TO_ENTRIES" value="true" />
-          <option name="ADD_JUNIT_TO_ENTRIES" value="true" />
         </inspection_tool>
         <inspection_tool class="UnusedParameters" level="WARNING" enabled="false" />
         <inspection_tool class="UnusedReturnValue" level="WARNING" enabled="false" />

diff --git a/Portal.iws b/Portal.iws
index a744a97..e603a54 100644 (file)
--- a/Portal.iws
+++ b/Portal.iws
@@ -2,25 +2,20 @@
 <project relativePaths="false" version="4">
   <component name="ChangeListManager">
     <list default="true" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/web-app/css/grey/screen.css" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/grails-app/views/layouts/grey.gsp" afterPath="$PROJECT_DIR$/grails-app/views/layouts/grey.gsp" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/grails-app/domain/Page.groovy" afterPath="$PROJECT_DIR$/grails-app/domain/Page.groovy" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/grails-app/views/page/edit.gsp" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/grails-app/views/layouts/blue_theme.gsp" afterPath="$PROJECT_DIR$/grails-app/views/layouts/blue_theme.gsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/web-app/css/grey/screen.css" afterPath="$PROJECT_DIR$/web-app/css/grey/screen.css" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Portal.iml" afterPath="$PROJECT_DIR$/Portal.iml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Portal.ipr" afterPath="$PROJECT_DIR$/Portal.ipr" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/grails-app/views/index.gsp" afterPath="$PROJECT_DIR$/grails-app/views/index.gsp" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/grails-app/conf/BootStrap.groovy" afterPath="$PROJECT_DIR$/grails-app/conf/BootStrap.groovy" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/grails-app/views/page/display.gsp" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/grails-app/views/page/list.gsp" afterPath="" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/grails-app/views/admin.gsp" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/grails-app/views/page/show.gsp" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/grails-app/controllers/AttachmentController.groovy" afterPath="$PROJECT_DIR$/grails-app/controllers/AttachmentController.groovy" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/grails-app/controllers/DisplayController.groovy" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/grails-app/controllers/PageController.groovy" afterPath="$PROJECT_DIR$/grails-app/controllers/PageController.groovy" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/grails-app/views/layouts/grey.gsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/grails-app/views/page/display.gsp" afterPath="$PROJECT_DIR$/grails-app/views/page/display.gsp" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Portal.iws" afterPath="$PROJECT_DIR$/Portal.iws" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/grails-app/views/page/create.gsp" afterPath="" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/grails-app/views/page/show.gsp" afterPath="$PROJECT_DIR$/grails-app/views/page/show.gsp" />
     </list>
-    <ignored path="Portal.iws" />
     <ignored path=".idea/workspace.xml" />
+    <ignored path="Portal.iws" />
   </component>
   <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
   <component name="Commander">
@@ -75,7 +70,83 @@
     <favorites_list name="Portal" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <file leaf-file-name="grey.gsp" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/grails-app/views/layouts/grey.gsp">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="19" column="58" selection-start="811" selection-end="811" vertical-scroll-proportion="-5.3773584">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="screen.css" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/web-app/css/grey/screen.css">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="11" column="49" selection-start="745" selection-end="745" vertical-scroll-proportion="0.32934132">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="index.gsp" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/grails-app/views/index.gsp">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="13" column="0" selection-start="320" selection-end="320" vertical-scroll-proportion="-8.863636">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="BootStrap.groovy" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/grails-app/conf/BootStrap.groovy">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="9" column="87" selection-start="369" selection-end="369" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PageController.groovy" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/grails-app/controllers/PageController.groovy">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="112" column="46" selection-start="3117" selection-end="3117" vertical-scroll-proportion="-19.064516">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Page.groovy" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/grails-app/domain/Page.groovy">
+          <provider editor-type-id="org.jetbrains.plugins.grails.perspectives.DomainClassesRelationsEditorProvider">
+            <state />
+          </provider>
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="61" column="26" selection-start="1092" selection-end="1092" vertical-scroll-proportion="-12.372549">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="show.gsp" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/grails-app/views/page/show.gsp">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="44" column="20" selection-start="1866" selection-end="1866" vertical-scroll-proportion="-1.5283018">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="list.gsp" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/grails-app/views/page/list.gsp">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="1" column="48" selection-start="1" selection-end="1" vertical-scroll-proportion="-0.28301886">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -265,32 +336,6 @@
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId" value="news" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Portal" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Portal" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Portal" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="grails-app" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="views" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
           <option name="myItemId" value="layouts" />
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
@@ -312,32 +357,6 @@
           <option name="myItemId" value="grails-app" />
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="views" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="attachment" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Portal" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Portal" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Portal" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="grails-app" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
       </PATH>
       <PATH>
         <PATH_ELEMENT>
@@ -437,9 +456,9 @@
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
     <property name="MemberChooser.showClasses" value="true" />
     <property name="GoToClass.includeLibraries" value="false" />
-    <property name="options.searchVisible" value="true" />
-    <property name="options.splitter.details.proportions" value="0.2" />
     <property name="dynamic.classpath" value="false" />
+    <property name="options.splitter.details.proportions" value="0.2" />
+    <property name="options.searchVisible" value="true" />
   </component>
   <component name="RunManager" selected="Grails Application.Portal">
     <configuration default="true" type="Remote" factoryName="Remote">
@@ -485,25 +504,6 @@
       <setting name="recompileFreq" value="" />
       <setting name="launchBrowser" value="true" />
     </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false" runner="emma">
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="ADDITIONAL_CLASS_PATH" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <envs />
-    </configuration>
     <configuration default="false" name="Portal" type="GrailsRunConfigurationType" factoryName="Grails Application">
       <module name="Portal" />
       <setting name="vmparams" value="" />
@@ -523,6 +523,25 @@
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Grails Application.Portal" />
     </list>
+    <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false" runner="emma">
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="ADDITIONAL_CLASS_PATH" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <envs />
+    </configuration>
     <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
       <Host>localhost</Host>
       <Port>5050</Port>
@@ -570,10 +589,8 @@
     <frame x="-5" y="43" width="1690" height="978" extended-state="6" />
     <editor active="false" />
     <layout>
-      <window_info id="Data Sources" 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" />
       <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" />
       <window_info id="Palette" 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" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" />
       <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" />
       <window_info id="Dataflow to this" 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" />
@@ -581,28 +598,30 @@
       <window_info id="Messages" 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" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32971016" sideWeight="0.5" order="6" side_tool="false" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" />
-      <window_info id="Maven Projects" 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" />
-      <window_info id="Grails" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32850242" sideWeight="0.0" order="7" side_tool="false" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32965687" sideWeight="0.65458935" order="0" side_tool="false" />
       <window_info id="Dependency Viewer" 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" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32910627" sideWeight="0.65500605" order="0" side_tool="false" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.33695653" sideWeight="0.5" order="2" side_tool="false" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.33655006" sideWeight="0.5" order="2" side_tool="false" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" />
+      <window_info id="Data Sources" 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" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" />
+      <window_info id="Maven Projects" 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" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" />
+      <window_info id="Grails" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32850242" sideWeight="0.0" order="7" side_tool="false" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" />
     </layout>
   </component>
   <component name="VcsManagerConfiguration">
     <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
-    <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
+    <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="PERFORM_UPDATE_IN_BACKGROUND" value="false" />
     <option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" />
     <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
     <option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" />
     <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
     <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
-    <option name="LAST_COMMIT_MESSAGE" />
+    <option name="LAST_COMMIT_MESSAGE" value="added auto timestamp" />
     <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
@@ -613,6 +632,10 @@
     <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
     <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
     <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
+    <MESSAGE value="add name to configuration" />
+    <MESSAGE value="add name to configuration&#10;" />
+    <MESSAGE value="add unique name to configuration&#10;" />
+    <MESSAGE value="added auto timestamp" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -626,61 +649,71 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/grails-app/views/attachment/show.gsp">
+    <entry file="file://$PROJECT_DIR$/grails-app/controllers/NewsController.groovy">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="11.6603775">
+        <state line="99" column="2" selection-start="3144" selection-end="3144" vertical-scroll-proportion="-11.645162">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/grails-app/views/news/show.gsp">
+    <entry file="file://$PROJECT_DIR$/grails-app/views/admin.gsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+        <state line="8" column="28" selection-start="206" selection-end="206" vertical-scroll-proportion="-5.4545455">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/grails-app/controllers/AttachmentController.groovy">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="5" column="38" selection-start="193" selection-end="193" vertical-scroll-proportion="-0.9677419">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/grails-app/domain/Attachment.groovy">
+    <entry file="file://$PROJECT_DIR$/grails-app/domain/News.groovy">
       <provider editor-type-id="org.jetbrains.plugins.grails.perspectives.DomainClassesRelationsEditorProvider">
         <state />
       </provider>
       <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+        <state line="0" column="6" selection-start="6" selection-end="6" vertical-scroll-proportion="-0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/grails-app/conf/BootStrap.groovy">
+    <entry file="file://$PROJECT_DIR$/grails-app/views/layouts/blue_theme.gsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="9" column="93" selection-start="358" selection-end="358" vertical-scroll-proportion="0.0">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="5.09434">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web-app/css/grey/screen.css">
+    <entry file="file://$PROJECT_DIR$/grails-app/views/layouts/admin.gsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="83" column="20" selection-start="3922" selection-end="3922" vertical-scroll-proportion="0.0">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/grails-app/views/page/display.gsp">
+    <entry file="file://$PROJECT_DIR$/grails-app/domain/PortalConfiguration.groovy">
+      <provider editor-type-id="org.jetbrains.plugins.grails.perspectives.DomainClassesRelationsEditorProvider">
+        <state />
+      </provider>
       <provider selected="true" editor-type-id="text-editor">
-        <state line="21" column="49" selection-start="531" selection-end="531" vertical-scroll-proportion="-5.943396">
+        <state line="8" column="21" selection-start="135" selection-end="135" vertical-scroll-proportion="-2.3529413">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/grails-app/views/page/show.gsp">
+    <entry file="file://$PROJECT_DIR$/grails-app/views/page/display.gsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="48" column="158" selection-start="2129" selection-end="2129" vertical-scroll-proportion="-5.3773584">
+        <state line="18" column="32" selection-start="499" selection-end="499" vertical-scroll-proportion="-5.09434">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/grails-app/views/layouts/grey.gsp">
+    <entry file="file://$PROJECT_DIR$/grails-app/controllers/PageController.groovy">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="23" column="33" selection-start="821" selection-end="821" vertical-scroll-proportion="-1.6415094">
+        <state line="112" column="46" selection-start="3117" selection-end="3117" vertical-scroll-proportion="-19.064516">
           <folding />
         </state>
       </provider>
@@ -690,42 +723,49 @@
         <state />
       </provider>
       <provider selected="true" editor-type-id="text-editor">
-        <state line="31" column="5" selection-start="571" selection-end="571" vertical-scroll-proportion="-9.117647">
+        <state line="61" column="26" selection-start="1092" selection-end="1092" vertical-scroll-proportion="-12.372549">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/grails-app/controllers/NewsController.groovy">
+    <entry file="file://$PROJECT_DIR$/grails-app/views/page/show.gsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="99" column="2" selection-start="3144" selection-end="3144" vertical-scroll-proportion="-11.645162">
+        <state line="44" column="20" selection-start="1866" selection-end="1866" vertical-scroll-proportion="-1.5283018">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/grails-app/views/admin.gsp">
+    <entry file="file://$PROJECT_DIR$/grails-app/views/page/list.gsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="8" column="28" selection-start="206" selection-end="206" vertical-scroll-proportion="-5.4545455">
+        <state line="1" column="48" selection-start="1" selection-end="1" vertical-scroll-proportion="-0.28301886">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/grails-app/views/index.gsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="5" column="2" selection-start="113" selection-end="113" vertical-scroll-proportion="-3.409091">
+        <state line="13" column="0" selection-start="320" selection-end="320" vertical-scroll-proportion="-8.863636">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/grails-app/controllers/PageController.groovy">
+    <entry file="file://$PROJECT_DIR$/grails-app/views/layouts/grey.gsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="110" column="0" selection-start="3063" selection-end="3063" vertical-scroll-proportion="-20.35484">
+        <state line="19" column="58" selection-start="811" selection-end="811" vertical-scroll-proportion="-5.3773584">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/grails-app/controllers/AttachmentController.groovy">
+    <entry file="file://$PROJECT_DIR$/grails-app/conf/BootStrap.groovy">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="5" column="38" selection-start="193" selection-end="193" vertical-scroll-proportion="-0.9677419">
+        <state line="9" column="87" selection-start="369" selection-end="369" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web-app/css/grey/screen.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="11" column="49" selection-start="745" selection-end="745" vertical-scroll-proportion="0.32934132">
           <folding />
         </state>
       </provider>

diff --git a/grails-app/conf/BootStrap.groovy b/grails-app/conf/BootStrap.groovy
index 1c0e814..fb2ba25 100644 (file)
--- a/grails-app/conf/BootStrap.groovy
+++ b/grails-app/conf/BootStrap.groovy
@@ -7,17 +7,17 @@ class BootStrap {
        assert config.save()
 
        // some top level pages
-       def root1 = new Page(title: "root1", author: "sven", language: "de", content: "Root 1")
-       def root2 = new Page(title: "root2", author: "sven", language: "de", content: "Root 2")
-       def root3 = new Page(title: "root3", author: "sven", language: "de", content: "Root 3")
+       def root1 = new Page(title: "Home", author: "sven", language: "en", content: "My Home is my castle.")
+       def root2 = new Page(title: "About Me", author: "sven", language: "en", content: "I am drunk and sick.")
+       def root3 = new Page(title: "Word of the Day", author: "sven", language: "en", content: "Miksch's Law:<br/>If a string has one end, then it has another end.")
        assert root1.save()
        assert root2.save()
        assert root3.save()
 
        // some second level pages
-       def child3 = new Page(title:"child3", author: "sven", language: "de", content: "child3", ordinal: 3, parent: root1)
-       def child2 = new Page(title:"child2", author: "sven", language: "de", content: "child2", ordinal: 2, parent: root1)
-       def child1 = new Page(title:"child1", author: "sven", language: "de", content: "child1", ordinal: 1, parent: root1)
+       def child3 = new Page(title:"No Info", author: "sven", language: "en", content: "Nothing", ordinal: 3, parent: root1)
+       def child2 = new Page(title:"Less Info", author: "sven", language: "en", content: "Not much", ordinal: 2, parent: root1)
+       def child1 = new Page(title:"Info", author: "sven", language: "en", content: "Too much", ordinal: 1, parent: root1)
        assert child1.save()
        assert child2.save()
        assert child3.save()

diff --git a/grails-app/controllers/PageController.groovy b/grails-app/controllers/PageController.groovy
index 27dafeb..f3127cf 100644 (file)
--- a/grails-app/controllers/PageController.groovy
+++ b/grails-app/controllers/PageController.groovy
@@ -96,6 +96,7 @@ class PageController {
     }
   }
 
+
   def display = {
     
     def pageInstance = Page.get(params.id)
@@ -109,7 +110,7 @@ class PageController {
 //      redirect(controller: pageInstance.controller, action: 'list')
 //    }
       
-      return [pageInstance: pageInstance]
+      return [pageInstance: pageInstance, subNavigation: pageInstance.getNavigationPages() ]
     }
   }
 

diff --git a/grails-app/domain/Page.groovy b/grails-app/domain/Page.groovy
index 9e4faba..c52f254 100644 (file)
--- a/grails-app/domain/Page.groovy
+++ b/grails-app/domain/Page.groovy
@@ -29,13 +29,31 @@ class Page implements Comparable {
     ordinal.compareTo(obj.ordinal)
   }
 
-  def findRoot() {
+  def getRoot() {
     if (parent)
-      return parent.findRoot()
+      return parent.getRoot()
     else
       return this
   }
 
+  def getSiblings() {
+    if (parent)
+      return Page.findAllByParent(parent)
+    else
+      return this
+  }
+
+  def getChildren() {
+    return Page.findAllByParent(this)
+  }
+
+  def getNavigationPages() {
+    if (parent == null)
+      return getChildren()
+    else
+      return getSiblings()
+  }
+
   boolean isAncestor(Page page) {
     if (parent == page)
       return true

diff --git a/grails-app/views/index.gsp b/grails-app/views/index.gsp
index 3676de5..3cbe362 100644 (file)
--- a/grails-app/views/index.gsp
+++ b/grails-app/views/index.gsp
@@ -1,20 +1,14 @@
+<%\r
+response.sendRedirect("page/display/1");\r
+%>\r
 <html>\r
     <head>\r
         <title>Welcome to Grails</title>\r
                <meta name="layout" content="main" />\r
     </head>\r
     <body>\r
-        <h1 style="margin-left:20px;">Welcome to Grails</h1>\r
-        <p style="margin-left:20px;width:80%">Congratulations, you have successfully started your first Grails application! At the moment\r
-        this is the default page, feel free to modify it to either redirect to a controller or display whatever\r
-        content you may choose. Below is a list of controllers that are currently deployed in this application,\r
-        click on each to execute its default action:</p>\r
-        <div class="dialog" style="margin-left:20px;width:60%;">\r
-            <ul>\r
-              <g:each var="c" in="${grailsApplication.controllerClasses}">\r
-                    <li class="controller"><g:link controller="${c.logicalPropertyName}">${c.fullName}</g:link></li>\r
-              </g:each>\r
-            </ul>\r
-        </div>\r
+        You should never see this page. Instead you should have been redirected to the main page.\r
+        Strange.\r
+        Never mind.    \r
     </body>\r
 </html>
\ No newline at end of file

diff --git a/grails-app/views/layouts/grey.gsp b/grails-app/views/layouts/grey.gsp
index 0938b6a..fb4a507 100644 (file)
--- a/grails-app/views/layouts/grey.gsp
+++ b/grails-app/views/layouts/grey.gsp
@@ -17,30 +17,17 @@
   <g:each var="root" in='${Page.findAll("from Page as p where p.parent=NULL")}'>
     <g:link action="display" id="${root.id}">${root.title}</g:link> |
   </g:each>
+  <a href="<g:resource file="admin.gsp"/>">Admin Interface</a>  
 </div>
 
 <div class="subnavigation">
-
-  <g:if test="${pageInstance}">
-
-    <g:each var="child1" in="${Page.findAllWhere(parent: pageInstance.findRoot())}">
-      <g:if test="${pageInstance.isAncestor(child1)}">
-        <div class="subsubnavigation">
-          <em>${child1.title}</em>
-            <g:each var="child2" in="${Page.findAllByParent(child1)}">
-              <g:link action="display" id="${child2.id}">${child2.title}</g:link>
-            </g:each>
-        </div>
-      </g:if>
-      <g:else>
-        <g:link action="display" id="${child1.id}">${child1.title}</g:link> <br/>
-      </g:else>
-    </g:each>
-  </g:if>
-
+  <ul>
+  <g:each var="page" in="${subNavigation}">
+    <li><g:link action="display" id="${page.id}">${page.title}</g:link></li>
+  </g:each>
+  </ul>
 </div>
 
-
 <div class="content">
   <h1>${pageInstance?.title}</h1>
   <g:layoutBody/>

diff --git a/grails-app/views/page/display.gsp b/grails-app/views/page/display.gsp
index 37d9a24..699f3c5 100644 (file)
--- a/grails-app/views/page/display.gsp
+++ b/grails-app/views/page/display.gsp
@@ -3,7 +3,7 @@
 
 <head>
   <title>${pageInstance?.title}</title>
-  <meta name="layout" content="${PortalConfiguration.findAll()[0].theme}"/>
+  <meta name="layout" content="${PortalConfiguration.findByName("default").theme}"/>
 </head>
 
 <body>

diff --git a/grails-app/views/page/show.gsp b/grails-app/views/page/show.gsp
index db6955e..ec41add 100644 (file)
--- a/grails-app/views/page/show.gsp
+++ b/grails-app/views/page/show.gsp
@@ -43,13 +43,6 @@
 
                         </tr>
                     
-                    <tr class="prop">
-                        <td valign="top" class="name">Root:</td>
-
-                        <td valign="top" class="value"><g:link controller="page" action="show" id="${pageInstance?.findRoot()?.id}">${pageInstance?.findRoot()?.title?.encodeAsHTML()}</g:link></td>
-
-                    </tr>
-
                         <tr class="prop">
                             <td valign="top" class="name">Ordinal:</td>
                             

diff --git a/web-app/css/grey/screen.css b/web-app/css/grey/screen.css
index 696ab10..0a83f54 100644 (file)
--- a/web-app/css/grey/screen.css
+++ b/web-app/css/grey/screen.css
@@ -9,7 +9,7 @@ blockquote, q {quotes:"" "";}
 a img {border:none;}
 
 /* typography.css */
-body {font-size:75%;color:#fff;background:#9c9d9f;font-family:"Verdana", "Helvetica Neue", Helvetica, sans-serif;}
+body {font-size:75%;color:#fff;background:#ffffff;font-family:"Verdana", "Helvetica Neue", Helvetica, sans-serif;}
 h1, h2, h3, h4, h5, h6 {font-weight:normal; color:#fff;}
 h1 {font-size:2.5em;margin-bottom:0.5em;}
 h2 {font-size:2em;margin-bottom:0.75em;}
@@ -78,10 +78,11 @@ textarea {width:390px;height:250px;padding:5px;}
 .success a {color:#264409;}
 
 /* main layout */
-div.header {border-bottom: solid thin black; background-color: #ccddee; width: 100%; font-size:150%; text-align: center}
-div.navigation {background-color: #eeddcc; border: dotted thin black; width: 100%; font-size:150%;}
-div.subnavigation {background-color: #ddccbb; border: solid thin red; width: 20%; height: 80%; float: left; font-size: 130%; clear: top}
+div.header {border-bottom: solid thin black; background-color: #e66510; width: 100%; font-family: "Times"; font-size:150%; text-align: center}
+div.navigation {background-color: #fffda6; color:black; border-bottom: solid thin black; width: 100%; font-size:150%;}
+div.subnavigation {background-color: #ffefda; color: black; border-right: dotted thin black; width: 20%; height: 80%; float: left; font-size: 130%; padding: 10px;}
+div.subnavigation li {list-style: none}
 div.subsubnavigation {background-color: #ccbbaa; border-bottom: solid thin black; width: 20%; font-size: 110%; }
-div.content {background-color: #ffffff; color: #000000; border: solid thin red; height: 80%;}
+div.content {background-color: #ffffff; color: #000000; border: none; height: 80%; padding: 10px; float: left  }
 div.content h1 {color: #000000}
 div.footer {background-color: #000000; width:100%; text-align: center; clear: both}