From 150061d5a14880bc24f983da2f4d054895eca8d3 Mon Sep 17 00:00:00 2001 From: Sven Arnold Date: Mon, 13 Apr 2009 17:17:46 +0200 Subject: [PATCH] fixed layout --- Grails-CMS.ipr | 4 +- Grails-CMS.iws | 301 +++++++++------ Portal-test.launch | 11 - Portal.ipr | 765 -------------------------------------- Portal.iws | 710 ----------------------------------- Portal.launch | 19 - Portal.tmproj | 73 ---- application.properties | 4 +- build.xml | 2 +- grails-app/conf/BootStrap.groovy | 6 +- grails-app/conf/Config.groovy | 6 +- grails-app/views/layouts/grey.gsp | 2 +- grails-app/views/page/display.gsp | 7 +- 13 files changed, 206 insertions(+), 1704 deletions(-) delete mode 100644 Portal-test.launch delete mode 100644 Portal.ipr delete mode 100644 Portal.iws delete mode 100644 Portal.launch delete mode 100644 Portal.tmproj diff --git a/Grails-CMS.ipr b/Grails-CMS.ipr index 94c5a81..83757cd 100644 --- a/Grails-CMS.ipr +++ b/Grails-CMS.ipr @@ -732,11 +732,11 @@ - - diff --git a/Grails-CMS.iws b/Grails-CMS.iws index 1fec959..a4e572d 100644 --- a/Grails-CMS.iws +++ b/Grails-CMS.iws @@ -2,11 +2,24 @@ - - + + + + + + + + + + + + + + + + - @@ -58,92 +71,62 @@ - + - - - - - - - - - - - - - - - - - - - - + + - + - - + + - + - - - - - - - - + + - - + + - + - - - - - + + - + - - + + - + - - - - - + + - + @@ -181,17 +164,105 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -199,13 +270,17 @@ - + + - @@ -213,17 +288,21 @@ - + + - - @@ -231,11 +310,15 @@ - + + - @@ -271,11 +354,11 @@ - - + + - + - + @@ -336,7 +419,7 @@ - + @@ -414,9 +497,9 @@ - + - + @@ -466,23 +549,6 @@ - - - - - - - - - - - - - - - - - @@ -507,85 +573,92 @@ - + - + - + - + - + - + - + - + - + - + - + - + + + + - + - + - + - + - - - - + - + - - + + + + + + - + - + + + + - + - + diff --git a/Portal-test.launch b/Portal-test.launch deleted file mode 100644 index 5d6558e..0000000 --- a/Portal-test.launch +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/Portal.ipr b/Portal.ipr deleted file mode 100644 index 637795a..0000000 --- a/Portal.ipr +++ /dev/null @@ -1,765 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Portal.iws b/Portal.iws deleted file mode 100644 index 5e56ca2..0000000 --- a/Portal.iws +++ /dev/null @@ -1,710 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - localhost - 5050 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Portal.launch b/Portal.launch deleted file mode 100644 index dbd2044..0000000 --- a/Portal.launch +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/Portal.tmproj b/Portal.tmproj deleted file mode 100644 index 46dfb1c..0000000 --- a/Portal.tmproj +++ /dev/null @@ -1,73 +0,0 @@ - - - - - documents - - - filename - Portal.launch - - - filename - build.xml - - - name - grails-app - regexFolderFilter - !.*/(\.[^/]*|CVS|_darcs|_MTN|\{arch\}|blib|.*~\.nib|.*\.(framework|app|pbproj|pbxproj|xcode(proj)?|bundle))$ - sourceDirectory - grails-app - - - name - test - regexFolderFilter - !.*/(\.[^/]*|CVS|_darcs|_MTN|\{arch\}|blib|.*~\.nib|.*\.(framework|app|pbproj|pbxproj|xcode(proj)?|bundle))$ - sourceDirectory - test - - - name - lib - regexFolderFilter - !.*/(\.[^/]*|CVS|_darcs|_MTN|\{arch\}|blib|.*~\.nib|.*\.(framework|app|pbproj|pbxproj|xcode(proj)?|bundle))$ - sourceDirectory - lib - - - name - scripts - regexFolderFilter - !.*/(\.[^/]*|CVS|_darcs|_MTN|\{arch\}|blib|.*~\.nib|.*\.(framework|app|pbproj|pbxproj|xcode(proj)?|bundle))$ - sourceDirectory - scripts - - - name - src - regexFolderFilter - !.*/(\.[^/]*|CVS|_darcs|_MTN|\{arch\}|blib|.*~\.nib|.*\.(framework|app|pbproj|pbxproj|xcode(proj)?|bundle))$ - sourceDirectory - src - - - name - web-app - regexFolderFilter - !.*/(\.[^/]*|CVS|_darcs|_MTN|\{arch\}|blib|.*~\.nib|.*\.(framework|app|pbproj|pbxproj|xcode(proj)?|bundle))$ - sourceDirectory - web-app - - - fileHierarchyDrawerWidth - 200 - metaData - - showFileHierarchyDrawer - - windowFrame - {{237, 127}, {742, 553}} - - diff --git a/application.properties b/application.properties index 520a3b5..1ae0f1a 100644 --- a/application.properties +++ b/application.properties @@ -1,7 +1,7 @@ #utf-8 -#Sun Apr 12 11:40:12 CEST 2009 +#Mon Apr 13 16:55:10 CEST 2009 app.version=0.1 app.servlet.version=2.4 app.grails.version=1.1 plugins.hibernate=1.1 -app.name=Portal +app.name=Grails-CMS diff --git a/build.xml b/build.xml index 78502f7..155a240 100644 --- a/build.xml +++ b/build.xml @@ -1,4 +1,4 @@ - + diff --git a/grails-app/conf/BootStrap.groovy b/grails-app/conf/BootStrap.groovy index 972eeef..293350b 100644 --- a/grails-app/conf/BootStrap.groovy +++ b/grails-app/conf/BootStrap.groovy @@ -1,10 +1,12 @@ +import grails.util.GrailsUtil + class BootStrap { def init = {servletContext -> switch (GrailsUtil.environment) { case "development": - break + // initialize configuration def config = new PortalConfiguration(name: "default", title: "Schnuppe Portal", motto: "A new star is born", theme: "grey") assert config.save() @@ -32,7 +34,7 @@ class BootStrap { assert news2.save() def newsPage = new Page(title: "News", author: "sven", language: "en", content: "", controllerName: "news", parent: root2) assert newsPage.save() - + break case "production": break } diff --git a/grails-app/conf/Config.groovy b/grails-app/conf/Config.groovy index 7d3c594..0aeb458 100644 --- a/grails-app/conf/Config.groovy +++ b/grails-app/conf/Config.groovy @@ -62,5 +62,7 @@ log4j = { warn 'org.mortbay.log' } - - \ No newline at end of file +// application specific configuration +cms.title='Simple Grails CMS' +cms.motto='A new star is born' +cms.theme='grey' diff --git a/grails-app/views/layouts/grey.gsp b/grails-app/views/layouts/grey.gsp index adb1641..0945aa9 100644 --- a/grails-app/views/layouts/grey.gsp +++ b/grails-app/views/layouts/grey.gsp @@ -1,6 +1,6 @@ - <g:layoutTitle default="Portal"/> + <g:layoutTitle default="${org.codehaus.groovy.grails.commons.ConfigurationHolder.config.cms.title}"/> diff --git a/grails-app/views/page/display.gsp b/grails-app/views/page/display.gsp index 699f3c5..87e8f89 100644 --- a/grails-app/views/page/display.gsp +++ b/grails-app/views/page/display.gsp @@ -1,9 +1,12 @@ -<%@ page contentType="text/html;charset=UTF-8" %> +<%@ page + contentType="text/html;charset=UTF-8" + +%> ${pageInstance?.title} - + -- 2.11.0