[gatewiki-commits] SF.net SVN: gatewiki:[1789] trunk/cow
|
View:
New views
1 Messages
—
Rating Filter:
Alert me
|
 |
[gatewiki-commits] SF.net SVN: gatewiki:[1789] trunk/cow
by hcunningham-2
::
Rate this Message:
Revision: 1789
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1789&view=rev Author: hcunningham Date: 2009-11-05 14:58:35 +0000 (Thu, 05 Nov 2009) Log Message: ----------- added a facility for switching off the iframe in rraw html views (use case: GATE user guide); documented it in the manual; backlogged task to push the GATE user guide into the g8rs.net server from the Hudson build Modified Paths: -------------- trunk/cow/doc/cow-backlog.html trunk/cow/doc/cow-backlog.yam trunk/cow/doc/gatewiki.html trunk/cow/doc/gatewiki.yam trunk/cow/grails-app/controllers/PageController.groovy Modified: trunk/cow/doc/cow-backlog.html =================================================================== --- trunk/cow/doc/cow-backlog.html 2009-11-05 13:43:32 UTC (rev 1788) +++ trunk/cow/doc/cow-backlog.html 2009-11-05 14:58:35 UTC (rev 1789) @@ -88,7 +88,11 @@ <ul> <li>need roles and perms for /sam, /sale/internal, /sins etc. [HC]</li> <li>migration: set up duplicate of existing apache server first then do janet - swap [IR, HC]</li> + swap [IR, HC] + <ul> + <li>change hudson rsync to push into gau-data on ge1 instead of g8rs-data + [IR]</li> + </ul></li> <li>CSS the twitter div a little to make it different (diff colour? make the URLs within it smaller to hide their ugliness?) [IR]</li> </ul></li> @@ -101,6 +105,16 @@ (dev, prod, test), or else they may be saved relative to one wiki in e.g. dev mode then restored relative to another in production mode?</li> </ul></li> +<li>start pushing TAO into the g8rs main wiki area [IR] + <ul> + <li>add a secure rsync from hudson to push the TAO build (minus .svns) into + ge1:/data/herd/g8rs-data/gau-main-tree/sale/tao + (make sure that there's a .cow:no-iframe file in the directory that Tex4HT + creates)</li> + <li>make sale/tao on g8rs non-writeable (so people don't try and edit the user + guide there) [note: I've added a topdoc/systems-admin section under GE1 + stuff for rules like this that we need to remember for the migration]</li> + </ul></li> <li>misc bugs (below)</li> <li>load testing</li> </ul> Modified: trunk/cow/doc/cow-backlog.yam =================================================================== --- trunk/cow/doc/cow-backlog.yam 2009-11-05 13:43:32 UTC (rev 1788) +++ trunk/cow/doc/cow-backlog.yam 2009-11-05 14:58:35 UTC (rev 1789) @@ -28,6 +28,8 @@ - need roles and perms for /sam, /sale/internal, /sins etc. [HC] - migration: set up duplicate of existing apache server first then do janet swap [IR, HC] + - change hudson rsync to push into gau-data on ge1 instead of g8rs-data + [IR] - CSS the twitter div a little to make it different (diff colour? make the URLs within it smaller to hide their ugliness?) [IR] - analyse the security holes found by ratproxy [IR, MG] @@ -37,6 +39,14 @@ - the serialised dependencies files should include the run mode in the name (dev, prod, test), or else they may be saved relative to one wiki in e.g. dev mode then restored relative to another in production mode? +- start pushing TAO into the g8rs main wiki area [IR] + - add a secure rsync from hudson to push the TAO build (minus .svns) into + ge1:/data/herd/g8rs-data/gau-main-tree/sale/tao + (make sure that there's a .cow:no-iframe file in the directory that Tex4HT + creates) + - make sale/tao on g8rs non-writeable (so people don't try and edit the user + guide there) [note: I've added a topdoc/systems-admin section under GE1 + stuff for rules like this that we need to remember for the migration] - misc bugs (below) - load testing Modified: trunk/cow/doc/gatewiki.html =================================================================== --- trunk/cow/doc/gatewiki.html 2009-11-05 13:43:32 UTC (rev 1788) +++ trunk/cow/doc/gatewiki.html 2009-11-05 14:58:35 UTC (rev 1789) @@ -2507,7 +2507,14 @@ permission to see a non-native HTML file if the directory to which the non-native file belongs is granted access by at least one of the two options.</p> +<p><b>To iframe or not to iframe?</b> <br/> In general the resultant page contains an +iframe that pulls in the raw HTML page. This is good for things like Javadocs +etcc., but in some cases you may want to just serve the body of the page +instead (e.g. the GATE user guide). If a file called <tt>.cow:no-iframe</tt> is +present in the directory containing the HTML page then the iframe will be +omitted.</p> + <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%--> <p><a name="regen"></a></p><a class="cow-section-anchor" name="section-4.11."/><h2 class="cow-heading"><span class="cow-sec-number">4.11. </span>Referencing and regeneration</h2> Modified: trunk/cow/doc/gatewiki.yam =================================================================== --- trunk/cow/doc/gatewiki.yam 2009-11-05 13:43:32 UTC (rev 1788) +++ trunk/cow/doc/gatewiki.yam 2009-11-05 14:58:35 UTC (rev 1789) @@ -1797,7 +1797,14 @@ permission to see a non-native HTML file if the directory to which the non-native file belongs is granted access by at least one of the two options. +*To iframe or not to iframe?* %br In general the resultant page contains an +iframe that pulls in the raw HTML page. This is good for things like Javadocs +etcc., but in some cases you may want to just serve the body of the page +instead (e.g. the GATE user guide). If a file called ^.cow:no-iframe^ is +present in the directory containing the HTML page then the iframe will be +omitted. + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %#regen %2 Referencing and regeneration Modified: trunk/cow/grails-app/controllers/PageController.groovy =================================================================== --- trunk/cow/grails-app/controllers/PageController.groovy 2009-11-05 13:43:32 UTC (rev 1788) +++ trunk/cow/grails-app/controllers/PageController.groovy 2009-11-05 14:58:35 UTC (rev 1789) @@ -110,8 +110,13 @@ if(allowed) { // render the whole (html) text if(params.chainFromPrint) // just dump the file to the response render(pageFile.text) - else // render via an iframe - pageBody = renderTemplate("iframeBody", [ thisPage : thisPage ]) + else { // render via an iframe (or as a body if asked) + if(new File(thisPage.pageFileDir, ".cow:no-iframe").exists() ) { + pageBody = FileUtils.getBody(pageFile) + } else { + pageBody = renderTemplate("iframeBody", [ thisPage : thisPage ]) + } + } } else { // disallowed: will be blank flash.message = message(code: 'cow.raw.html.disallowed') } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ gatewiki-commits mailing list gatewiki-commits@... https://lists.sourceforge.net/lists/listinfo/gatewiki-commits |
| Free embeddable forum powered by Nabble | Forum Help |
