Menu
▾
▴
[Exist-commits] eXist-1.0/webapp/admin admin.xql,1.5,1.6 browse.xqm,1.4,1.5 admin.css,1.4,1.5 setup.xqm,1.1,1.2
|
From: Wolfgang M. M. <wol...@us...> - 2004-10-29 21:14:30
|
Update of /cvsroot/exist/eXist-1.0/webapp/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20503/webapp/admin Modified Files: admin.xql browse.xqm admin.css setup.xqm Log Message: Index: browse.xqm =================================================================== RCS file: /cvsroot/exist/eXist-1.0/webapp/admin/browse.xqm,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** browse.xqm 27 Oct 2004 21:01:31 -0000 1.4 --- browse.xqm 29 Oct 2004 21:14:18 -0000 1.5 *************** *** 18,24 **** return <div class="panel"> ! { ! browse:process-action($collection) ! } <div class="panel-head">Browsing Collection: {$colName}</div> <form method="POST" enctype="multipart/form-data"> --- 18,22 ---- return <div class="panel"> ! { browse:process-action($collection) } <div class="panel-head">Browsing Collection: {$colName}</div> <form method="POST" enctype="multipart/form-data"> *************** *** 26,30 **** browse:display-collection($collection) } ! <table class="actions"> <tr><td colspan="3"><input type="submit" name="action" value="Remove Selected"/></td></tr> --- 24,28 ---- browse:display-collection($collection) } ! <table class="actions" cellspacing="0"> <tr><td colspan="3"><input type="submit" name="action" value="Remove Selected"/></td></tr> *************** *** 45,49 **** <tr> <td><input type="submit" name="action" value="Upload"/></td> ! <td><input type="file" size="40" name="upload"/></td> <td>Store as:<br/> <input type="text" name="name" size="20"/></td> --- 43,47 ---- <tr> <td><input type="submit" name="action" value="Upload"/></td> ! <td><input type="file" size="30" name="upload"/></td> <td>Store as:<br/> <input type="text" name="name" size="20"/></td> *************** *** 92,97 **** return <div class="process"> <ul> ! <li>Storing uploaded content to: {$docName}</li> { xdb:store($collection, $docName, $file) --- 90,96 ---- return <div class="process"> + <h3>Actions:</h3> <ul> ! <li>Storing uploaded content to: {$docName}</li> { xdb:store($collection, $docName, $file) *************** *** 115,118 **** --- 114,118 ---- return <div class="process"> + <h3>Actions:</h3> <ul> <li>Storing resources from URI: {$path}</li> *************** *** 131,134 **** --- 131,135 ---- return <div class="process"> + <h3>Actions:</h3> <ul> { *************** *** 163,166 **** --- 164,168 ---- return <div class="process"> + <h3>Actions:</h3> <ul> { *************** *** 183,187 **** let $colName := util:collection-name($collection) return ! <table cellpadding="5" id="browse"> <tr> <th/> --- 185,189 ---- let $colName := util:collection-name($collection) return ! <table cellspacing="0" cellpadding="5" id="browse"> <tr> <th/> *************** *** 192,195 **** --- 194,198 ---- <th>Created</th> <th>Modified</th> + <th>Size (KB)</th> </tr> <tr> *************** *** 201,204 **** --- 204,208 ---- <td/> <td/> + <td/> </tr> { *************** *** 225,228 **** --- 229,233 ---- <td>{date:format-dateTime($created)}</td> <td/> + <td/> </tr> }; *************** *** 236,240 **** <tr> <td><input type="checkbox" name="resource" value="{$parent}/{$child}"/></td> ! <td><a target="_new" href="{request:encode-url('view-source.xql')}?source={$parent}/{$child}">{$child}</a></td> <td class="perm">{xdb:permissions-to-string(xdb:get-permissions($collection, $child))}</td> <td>{xdb:get-owner($collection, $child)}</td> --- 241,245 ---- <tr> <td><input type="checkbox" name="resource" value="{$parent}/{$child}"/></td> ! <td><a target="_new" href="../servlet/{$parent}/{$child}">{$child}</a></td> <td class="perm">{xdb:permissions-to-string(xdb:get-permissions($collection, $child))}</td> <td>{xdb:get-owner($collection, $child)}</td> *************** *** 242,245 **** --- 247,251 ---- <td>{date:format-dateTime(xdb:created($collection, $child))}</td> <td>{date:format-dateTime(xdb:last-modified($collection, $child))}</td> + <td>{xdb:size($collection, $child) div 1024}</td> </tr> }; Index: setup.xqm =================================================================== RCS file: /cvsroot/exist/eXist-1.0/webapp/admin/setup.xqm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** setup.xqm 28 Oct 2004 17:04:58 -0000 1.1 --- setup.xqm 29 Oct 2004 21:14:18 -0000 1.2 *************** *** 8,17 **** declare namespace util="http://exist-db.org/xquery/util"; - declare variable $setup:shakesPat { - ( "shakespeare/*.xml", "shakespeare/*.xsl" ) - }; - - declare variable $setup:xincludePat { "xinclude/*.xml" }; - declare function setup:main() as element() { <div class="panel"> --- 8,11 ---- *************** *** 21,28 **** return if($action) then ! if($action eq "Import Sample Data") then setup:importLocal() ! else setup:importFromURLs() else setup:page1() --- 15,24 ---- return if($action) then ! if($action eq "Import Example Data") then setup:importLocal() ! else if($action eq "Import Remote Files") then setup:importFromURLs() + else + setup:page3() else setup:page1() *************** *** 37,76 **** "samples") return ( ! <div class="actions"> <ul> { setup:create-collection("/db", "shakespeare"), setup:create-collection("/db/shakespeare", "plays"), ! setup:store-files("/db/shakespeare/plays", $home, $setup:shakesPat), setup:create-collection("/db", "xinclude"), ! setup:store-files("/db/xinclude", $home, $setup:xincludePat), ! setup:store-files("/db", $home, ("*.xml", "*.rdf")) } </ul> ! </div>, ! setup:page2() ) }; declare function setup:importFromURLs() as element()+ { ! <div class="actions"> ! <ul> ! { ! setup:create-collection("/db", "xmlad"), ! setup:load-URL("/db/xmlad", ! "http://belnet.dl.sourceforge.net/sourceforge/xmlad/xmlad.xml", ! "xmlad.xml") ! } ! </ul> ! </div> }; declare function setup:load-URL($collection, $url, $docName) as element() { xdb:store($collection, $docName, xs:anyURI($url)), ! <li>File xmlad.xml imported from url: {$url}</li> }; ! declare function setup:store-files($collection, $home, $patterns) as element()* { ! let $stored := xdb:store-files-from-pattern($collection, $home, $patterns) for $doc in $stored return --- 33,97 ---- "samples") return ( ! setup:page2(), ! <div class="process"> ! <h3>Actions:</h3> <ul> { setup:create-collection("/db", "shakespeare"), setup:create-collection("/db/shakespeare", "plays"), ! setup:store-files("/db/shakespeare/plays", $home, ! ( "shakespeare/*.xml", "shakespeare/*.xsl" ), ! "text/xml" ! ), ! setup:store-files("/db/shakespeare/plays", $home, ! "shakespeare/*.css", "text/css"), setup:create-collection("/db", "xinclude"), ! setup:store-files("/db/xinclude", $home, ! ( "xinclude/*.xsl", "xinclude/*.xml"), "text/xml"), ! setup:create-collection("/db", "library"), ! setup:store-files("/db/library", $home, "*.rdf", "text/xml"), ! setup:store-files("/db", $home, "*.xml", "text/xml") } </ul> ! </div> ) }; declare function setup:importFromURLs() as element()+ { ! ( ! setup:page3(), ! <div class="process"> ! <h3>Actions:</h3> ! <ul> ! { ! let $includeXmlad := request:request-parameter("xmlad", ()), ! $includeMondial := request:request-parameter("mondial", ()) ! return ( ! if($includeXmlad) then ( ! setup:create-collection("/db", "xmlad"), ! setup:load-URL("/db/xmlad", ! "http://belnet.dl.sourceforge.net/sourceforge/xmlad/xmlad.xml", ! "xmlad.xml") ! ) else (), ! if($includeMondial) then ( ! setup:create-collection("/db", "mondial"), ! setup:load-URL("/db/mondial", ! "http://dbis.informatik.uni-goettingen.de/Mondial/mondial-europe.xml", ! "mondial.xml") ! ) else () ! ) ! } ! </ul> ! </div> ! ) }; declare function setup:load-URL($collection, $url, $docName) as element() { xdb:store($collection, $docName, xs:anyURI($url)), ! <li>File {$docName} imported from url: {$url}</li> }; ! declare function setup:store-files($collection, $home, $patterns, $mimeType) as element()* { ! let $stored := xdb:store-files-from-pattern($collection, $home, $patterns, $mimeType) for $doc in $stored return *************** *** 84,103 **** }; ! declare function setup:page1() as element()+ { ! <p>eXist ships with a number of XQuery and other examples. Some of these ! require certain documents to be stored in the database. Clicking on the button ! below will import the required data.</p>, <form action="{request:encode-url(request:request-uri())}" method="POST"> ! <input type="submit" name="action" value="Import Sample Data"/> <input type="hidden" name="panel" value="setup"/> </form> }; ! declare function setup:page2() as element()+ { ! <p>The XQuery examples also use some XML data not included with the distribution. ! I can try to download the corresponding documents. Do you want me to do so?</p>, <form action="{request:encode-url(request:request-uri())}" method="POST"> ! <input type="submit" name="action" value="Import Remote Files"/> <input type="hidden" name="panel" value="setup"/> </form> }; --- 105,139 ---- }; ! declare function setup:page1() as element() { <form action="{request:encode-url(request:request-uri())}" method="POST"> ! <p>eXist ships with a number of XQuery examples. Some of these ! require certain documents to be stored in the database. Clicking on the button ! below will import the required data from the samples directory:</p> ! <input type="submit" name="action" value="Import Example Data"/> <input type="hidden" name="panel" value="setup"/> </form> }; ! declare function setup:page2() as element() { <form action="{request:encode-url(request:request-uri())}" method="POST"> ! <p>The XQuery examples also use some XML data not included with the distribution. ! I can try to download the corresponding data. Do you want me to do so?</p> ! ! <input type="checkbox" name="xmlad" checked="true"/> ! <a href="http://www.xml-acronym-demystifier.org">The XML Acronym Demystifier</a> ! (approx. 384K)<br/> ! ! <input type="checkbox" name="mondial"/> ! <a href="http://dbis.informatik.uni-goettingen.de/Mondial/">The Mondial Database (Europe)</a> ! (approx. 410K) ! ! <p><input type="submit" name="action" value="Import Remote Files"/> ! <input type="submit" name="action" value="Skip"/></p> <input type="hidden" name="panel" value="setup"/> </form> }; + + declare function setup:page3() as element() { + <p>Files have been loaded. You can now go back to the + <a href="../examples.xml">examples page</a>.</p> + }; Index: admin.css =================================================================== RCS file: /cvsroot/exist/eXist-1.0/webapp/admin/admin.css,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin.css 28 Oct 2004 17:04:57 -0000 1.4 --- admin.css 29 Oct 2004 21:14:18 -0000 1.5 *************** *** 11,14 **** --- 11,15 ---- .header { position: relative; + top: 10px; padding: 5px; display: block; *************** *** 20,28 **** .info { vertical-align: top; ! float: right; color: #999999; font-size: x-small; - position: relative; } --- 21,29 ---- .info { + position: absolute; vertical-align: top; ! right: 20px; color: #999999; font-size: x-small; } *************** *** 69,75 **** width: 62%; margin-top: 15px; display: block; background-color: white; - overflow: hidden; vertical-align: top; } --- 70,77 ---- width: 62%; margin-top: 15px; + margin-left: 15px; + padding-top: 10px; display: block; background-color: white; vertical-align: top; } *************** *** 77,83 **** .panel-head { font-size: large; - padding: 10px; - padding-left: 5px; - } --- 79,82 ---- *************** *** 97,100 **** --- 96,100 ---- margin-left: 15px; font-size: smaller; + border-bottom: 1px solid black; } *************** *** 108,133 **** } ! .panel .process { padding: 5px; ! border: 1px solid #0000AA; ! font-size: smaller; margin-bottom: 10px; } .process ul { list-style-type: none; } .panel .actions { margin-top: 15px; font-size: smaller; width: 100%; } ! .actions td { ! border-top: 1px solid #0000AA; ! margin-top: 10px; ! padding-top: 10px; ! padding-bottom: 10px; padding-right: 5px; padding-left: 5px; --- 108,148 ---- } ! .process { padding: 5px; ! border-top: 1px solid #999; ! border-bottom: 1px solid #999; ! font-size: small; margin-bottom: 10px; + margin-left: 25px; + margin-right: 25px; + } + + .process h3 { + color: #999; + padding: 0px; + margin-top: 5px; + margin-bottom: 0px; } .process ul { list-style-type: none; + padding-left: 0px; + margin-top: 0px; + } + + .process li { + margin-left: 0px; } .panel .actions { margin-top: 15px; + margin-left: 15px; font-size: smaller; width: 100%; } ! .actions td { ! padding-top: 5px; ! padding-bottom: 5px; padding-right: 5px; padding-left: 5px; Index: admin.xql =================================================================== RCS file: /cvsroot/exist/eXist-1.0/webapp/admin/admin.xql,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** admin.xql 28 Oct 2004 17:04:58 -0000 1.5 --- admin.xql 29 Oct 2004 21:14:18 -0000 1.6 *************** *** 45,49 **** $credentials is either an empty sequence or a pair (user, password). :) ! declare function admin:main($credentials as xs:string*) as element() { if(not($credentials)) then admin:display-login-form() --- 45,49 ---- $credentials is either an empty sequence or a pair (user, password). :) ! declare function admin:main($credentials as xs:string*) as element()+ { if(not($credentials)) then admin:display-login-form() |