Changeset 1651 for trunk/grails-app
- Timestamp:
- Mar 18, 2011, 3:32:42 PM (10 years ago)
- Location:
- trunk/grails-app
- Files:
-
- 2 added
- 1 deleted
- 3 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/conf/Config.groovy
r1644 r1651 21 21 // the external configuration to override the default 22 22 // configuration (e.g. ~/.grails-config/ci-gscf.properties) 23 "file:${userHome}/.grails-config/${grails.util.GrailsUtil.environment}-${appName}.properties" 23 "file:${userHome}/.grails-config/${grails.util.GrailsUtil.environment}-${appName}.properties", 24 25 // or in /etc/gscf/ (e.g. /etc/gscf/ci.properties) 26 "file:/etc/${appName}/${grails.util.GrailsUtil.environment}.properties" 24 27 ] 25 28 -
trunk/grails-app/controllers/generic/installation/SetupController.groovy
r1648 r1651 3 3 import grails.plugins.springsecurity.Secured 4 4 import dbnp.authentication.SecUser 5 import org.codehaus.groovy.grails.commons.ConfigurationHolder 5 6 6 7 /** … … 53 54 if (pluginManager.getGrailsPlugin('grom')) "entering the WebFlow".grom() 54 55 56 // get configuration 57 def config = ConfigurationHolder.config 58 println config.dump() 59 println config.dataSource.dump() 60 61 def configPath = new File("/etc/${meta(name: 'app.name')}/") 62 if (configPath.exists()) { 63 println "path exists" 64 } else { 65 println "path does not exist" 66 } 67 68 if (configPath.canWrite()) { 69 println "path is writable" 70 } else { 71 println "path is not writable" 72 } 73 74 def configFile = new File("/etc/${meta(name: 'app.name')}/${grails.util.GrailsUtil.environment}.properties") 75 if (configFile.exists()) { 76 println "file exists" 77 } else { 78 println "file does not exist" 79 } 80 81 55 82 // define variables in the flow scope which is availabe 56 83 // throughout the complete webflow also have a look at … … 60 87 // wizard tabs. Also see common/_tabs.gsp for more information 61 88 flow.page = 0 89 //flow.config = ConfigurationHolder.config 62 90 flow.pages = [ 63 [title: ' Page One'],64 [title: ' Page Two'],91 [title: 'Configuration Location'], 92 [title: 'Database'], 65 93 [title: 'Page Three'], 66 94 [title: 'Page Four'], 67 95 [title: 'Done'] 68 96 ] 69 flow.cancel = true; 70 flow.quickSave = true; 97 flow.cancel = true 98 flow.quickSave = true 99 100 // define famfamfam icons 101 flow.icons = [ 102 'true' : 'accept', 103 false : 'cancel' 104 ] 105 106 // add configuration information to the flow scope 107 flow.configInfo = [ 108 path : configPath, 109 pathExists : configPath.exists(), 110 pathCanRead : configPath.canRead(), 111 pathCanWrite : configPath.canWrite(), 112 pathSummary : (configPath.exists() && configPath.canRead() && configPath.canWrite()), 113 file : configFile, 114 fileExists : configFile.exists(), 115 fileCanRead : configFile.canRead(), 116 fileCanWrite : configFile.canWrite(), 117 fileSummary : (configFile.exists() && configFile.canRead() && configFile.canWrite()) 118 ] 71 119 72 120 success() … … 87 135 success() 88 136 } 89 on("next").to " pageOne"137 on("next").to "configuration" 90 138 } 91 139 92 140 // first wizard page 93 pageOne{94 render(view: "_ page_one")95 onRender { 96 // Grom a development message 97 if (pluginManager.getGrailsPlugin('grom')) ".rendering the partial: pages/_ page_one.gsp".grom()141 configuration { 142 render(view: "_configuration_location") 143 onRender { 144 // Grom a development message 145 if (pluginManager.getGrailsPlugin('grom')) ".rendering the partial: pages/_database.gsp".grom() 98 146 99 147 flow.page = 1 … … 116 164 flow.page = 5 117 165 }.to "save" 166 on("toConfigurationPath").to "configurationPath" 167 on("toConfigurationFile").to "configurationFile" 118 168 } 119 169 120 170 // second wizard page 121 pageTwo{122 render(view: "_ page_two")171 database { 172 render(view: "_database") 123 173 onRender { 124 174 // Grom a development message -
trunk/grails-app/views/setup/index.gsp
r1648 r1651 17 17 <g:javascript library="jquery" plugin="jquery"/> 18 18 <link rel="stylesheet" href="${resource(dir: 'css', file: 'ajaxflow.css')}"/> 19 <link rel="stylesheet" href="${resource(dir: 'css', file: 'setupwizard.css')}"/> 19 20 </head> 20 21 <body> -
trunk/grails-app/views/setup/pages/_configuration_location.gsp
r1648 r1651 1 1 <% 2 2 /** 3 * second wizard page / tab3 * Configuration Location 4 4 * 5 5 * @author Jeroen Wesbeek … … 13 13 %> 14 14 <af:page> 15 <h1>Page Two</h1> 16 <p> 17 You can also quickly jump to page 4 if you want... 18 <af:ajaxButton name="toPageFour" value="to page 4!" afterSuccess="onPage();" class="prevnext" /> 19 </p> 20 <p> 21 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed eget risus eget nibh ultrices ultricies. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sit amet velit vitae urna lobortis sollicitudin. Pellentesque ut nibh eget velit molestie faucibus vel nec libero. Pellentesque sagittis velit vulputate mauris sollicitudin a venenatis ligula accumsan. Aenean pellentesque magna quis magna lobortis non auctor nisi vulputate. Morbi ut tortor a elit ultrices euismod et et velit. Sed auctor, eros sed hendrerit pretium, ligula felis vehicula magna, rutrum faucibus ligula justo sit amet urna. Duis rutrum vulputate neque vitae ullamcorper. Sed faucibus aliquam porttitor. Integer neque ante, euismod eu vehicula nec, pulvinar sit amet ligula. Aliquam non orci id diam dictum interdum in at elit. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Phasellus pretium nulla ut justo pharetra vel pellentesque odio pharetra. Nam malesuada cursus libero, ut sagittis libero gravida vel. 22 </p> 23 <p> 24 Ut orci metus, blandit nec sollicitudin eu, porttitor non justo. Ut non elit sed justo volutpat blandit. Ut enim lacus, porta ac lacinia eu, dictum sit amet ipsum. Cras volutpat interdum massa sed scelerisque. Vestibulum ut lorem dolor. Fusce posuere orci non felis accumsan nec rutrum enim viverra. Nam sed augue quis lectus ultrices sodales. Aliquam ac fermentum justo. Quisque massa dui, scelerisque vel semper eu, dictum ut est. Donec vestibulum pulvinar magna eu eleifend. Nullam id ipsum dui, porta posuere enim. Mauris pellentesque, nisl ut faucibus egestas, diam quam mollis ante, ut mattis sem nunc id lacus. 25 </p> 15 <h1>Configuration file</h1> 16 17 <font color="red"><b><i>NOTE: this wizard is in development!</i></b></font> 18 19 <g:if test="${configInfo.pathSummary && configInfo.fileSummary}"> 20 OK! 21 </g:if> 22 <g:else> 23 <div class="checklist"> 24 <ul class="header"> 25 <li class="path">Path</li> 26 <li>exists</li> 27 <li>readable</li> 28 <li>writable</li> 29 </ul> 30 <ul> 31 <li class="path">${configInfo.path}</li> 32 <li><img src="${fam.icon(name: icons[(configInfo.pathExists.toString())])}"/></li> 33 <li><img src="${fam.icon(name: icons[(configInfo.pathCanRead.toString())])}"/></li> 34 <li><img src="${fam.icon(name: icons[(configInfo.pathCanWrite.toString())])}"/></li> 35 <li class="summary"><g:if test="${!configInfo.pathSummary}"><img src="${fam.icon(name: 'arrow_right')}"/><af:ajaxButton name="toConfigurationPath" value="resolve issues" afterSuccess="onPage();" class="prevnext" /></g:if></li> 36 </ul> 37 <ul> 38 <li class="path">${configInfo.file}</li> 39 <li><img src="${fam.icon(name: icons[(configInfo.fileExists.toString())])}"/></li> 40 <li><img src="${fam.icon(name: icons[(configInfo.fileCanRead.toString())])}"/></li> 41 <li><img src="${fam.icon(name: icons[(configInfo.fileCanWrite.toString())])}"/></li> 42 <li class="summary"><g:if test="${!configInfo.fileSummary}"><img src="${fam.icon(name: 'arrow_right')}"/><af:ajaxButton name="toConfigurationFile" value="resolve issues" afterSuccess="onPage();" class="prevnext" /></g:if></li> 43 </ul> 44 </div> 45 </g:else> 46 26 47 </af:page> -
trunk/grails-app/views/setup/pages/_database.gsp
r1648 r1651 1 1 <% 2 2 /** 3 * first wizard page / tab3 * Database configuration 4 4 * 5 5 * @author Jeroen Wesbeek … … 13 13 %> 14 14 <af:page> 15 <h1>Page one of the '<i>setup</i>' ajaxflow</h1> 16 <p> 17 <b> 18 This ajaxflow supports by default a spinner / please wait dialogue when clicking buttons / tabs. This 19 can be disabled by removing the <i>spinner="ajaxFlowWait"</i> argument from the <i>af:flow</i> 20 definition in <i>common/_ajaxflow.gsp</i>. If you're disabling this feature you might also want to remove the 21 then obsolete tag <g:render template="common/please_wait"/> from <i>common/_ajaxflow.gsp</i> 22 as well. 23 </b> 24 </p> 25 <p> 26 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus ultricies sapien vestibulum mi mattis sed mollis lorem hendrerit. Sed pretium dignissim placerat. Maecenas ut lorem dui, nec lacinia massa. Nunc pharetra justo sed purus fermentum lobortis. Quisque ac ante at sapien faucibus feugiat. Aliquam lacus tortor, gravida eget mollis quis, lacinia eu enim. Phasellus vel neque neque, rhoncus volutpat erat. Aliquam sodales porttitor urna, sed volutpat ipsum lacinia vitae. Nam pretium, eros fringilla vehicula congue, erat quam congue est, at feugiat ante ante nec magna. Pellentesque placerat facilisis massa in venenatis. Proin turpis lorem, viverra at posuere id, porta a justo. Quisque consectetur enim at justo dapibus pulvinar. 27 </p> 28 <p> 29 Cras tristique iaculis massa ac semper. Morbi malesuada pellentesque magna, nec pellentesque risus pretium at. Nullam eros velit, iaculis eget porta nec, euismod vitae diam. Maecenas tincidunt fermentum erat, sit amet aliquet ligula luctus sed. Vestibulum sed viverra metus. In hac habitasse platea dictumst. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Aliquam dictum, lacus ac placerat condimentum, leo est consequat velit, et euismod augue leo ut leo. Sed blandit mi sed tortor elementum in placerat tortor pellentesque. Donec diam lorem, elementum vitae eleifend eget, suscipit id magna. Pellentesque nunc nulla, aliquam vel lobortis quis, ullamcorper quis eros. Maecenas cursus, orci a accumsan pulvinar, velit est adipiscing arcu, ac fermentum ligula felis sit amet velit. Pellentesque ac mauris a nisl fermentum vestibulum a a est. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Praesent a magna elit. 30 </p> 15 <h1>Database configuration</h1> 16 17 31 18 </af:page>
Note: See TracChangeset
for help on using the changeset viewer.