Changeset 8720


Ignore:
Timestamp:
2004-12-02T09:56:11+13:00 (19 years ago)
Author:
schweer
Message:

worked on web interface

Location:
trunk
Files:
30 added
30 edited

Legend:

Unmodified
Added
Removed

  • trunk/greenstone3-extensions/gsdl-as/lib/templates/error.vm

    r8630 r8720  
    33    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    44<html xmlns="http://www.w3.org/1999/xhtml">
    5 <head>
    6 <title>Greenstone Digital Library Software</title>
    7 <link href="default.css" rel="stylesheet" type="text/css"/>
    8 </head>
    9 <body>
    10 <h1>Alerting Service for Greenstone</h1>
    11 <h2>$title</h2>
    12 <div class="content">
    13 <p class="error">$message</p>
    14 <p class="details">$details</p>
    15 </div>
     5    <head>
     6        <title>Greenstone Digital Library Software</title>
     7        <link href="default.css" rel="stylesheet" type="text/css"/>
     8    </head>
     9    <body>
     10        <div id="content">
     11            <h3>Alerting Service for Greenstone</h3>
     12            <p>$title</p>
     13            <p class="error">$message</p>
     14            <p class="details">$details</p>
     15            <a href="/alerting">back</a> to the alerting service
     16        </div>
    1617
    17 </body>
     18    </body>
    1819</html>

  • trunk/greenstone3-extensions/gsdl-as/lib/templates/general.vm

    r8630 r8720  
    88</head>
    99<body>
    10 <h1>Alerting Service for Greenstone</h1>
    11 <h2>$title</h2>
    12 <div class="content">
     10<div id="content">
     11<h3>Alerting Service for Greenstone</h3>
     12<p>$title</p>
    1313<p class="message">$message</p>
     14<a href="/alerting">back</a> to the alerting service
    1415</div>
    1516

  • trunk/greenstone3-extensions/gsdl-as/lib/templates/list.vm

    r8630 r8720  
    55<head>
    66<title>Greenstone Digital Library Software</title>
    7 <link href="default.css" rel="stylesheet" type="text/css"/>
     7<link href="list.css" rel="stylesheet" type="text/css"/>
    88</head>
    99<body>
    10 <h1>Alerting Service for Greenstone</h1>
    11 <h2>$title</h2>
    12 <div class="content">
     10<div id="content">
     11<h3>Alerting Service for Greenstone</h3>
     12<p>$title</p>
    1313#foreach($sub in $list)
    1414    <div class="subscription">
    15         <span class="sub_id">$sub.Id</span>
    16         <table>
     15        <p><span class="sub_id">Subscription $sub.Id</span><br/>
     16        <a href="service?action=showFeed&subscriptionID=$sub.Id">show matching events</a> | <a href="service?action=editSubscription&subscriptionID=$sub.Id">edit subscription</a></p>
     17        <table class="subscription">
    1718            <thead>
    1819                <tr><th>Field</th><th>Predicate</th></tr>
    1920            </thead>
    20             <tfoot/>
     21            <tfoot><tr><th/><th/></tr></tfoot>
    2122            <tbody>
    2223                #foreach($pred in $sub.Predicates)
    … …  
    2829            </tbody>
    2930        </table>
     31        <br/>
    3032    </div>
    3133#end
     34<a href="/alerting">back</a> to the alerting service
    3235</div>
    3336

  • trunk/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/GreenstoneCommunicator.java

    r8609 r8720  
    99package org.greenstone.gsdlas;
    1010
     11import java.io.OutputStreamWriter;
    1112import java.net.URL;
    1213import java.util.*;
    … …  
    1718import org.apache.soap.Fault;
    1819import org.apache.soap.rpc.*;
     20import org.apache.soap.util.xml.DOM2Writer;
    1921import org.w3c.dom.*;
    2022
    … …  
    119121       
    120122        Set result = new TreeSet();
     123        //DOM2Writer.serializeAsXML(root, new OutputStreamWriter(System.out));
    121124       
    122125        Element response = sendToGreenstone(document.getDocumentElement());

  • trunk/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/profiles/PredicateFactory.java

    r8609 r8720  
    4646            throws ParseException {
    4747        Predicate result = null;
     48        if (value == null || value.length() == 0) {
     49            return null;
     50        }
     51       
    4852        if (key.equals("type")) {
    4953            return result;

  • trunk/greenstone3-extensions/gsdl-as/web/about.html

    r8630 r8720  
    1 <html><head>
    2     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
    3       <title>Greenstone Version 3</title></head>
    4 
    5   <body alink="#cc9900" background="images/chalk.gif" bgcolor="#ffffff" link="#006666" text="#000000" vlink="#666633">
     1<?xml version="1.0"?>
     2<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     3    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
     4<html xmlns="http://www.w3.org/1999/xhtml">
     5<head>
     6    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     7      <title>Greenstone Version 3</title>
     8            <link rel="stylesheet" type="text/css" href="default.css"/>
     9            </head>
     10  <body>
    611   
    712    <!-- page banner (_style:pagebanner_) -->
    8     <center>
    9       <table cellpadding="0" cellspacing="0" width="537">
    10     <tbody><tr valign="top">
    11       <td rowspan="2" align="left"><center><img src="images/gsdlhead.gif" alt="Greenstone Digital Library Software" height="100" width="300"></center></td>
    12       <td align="right"></td>
    13     </tr>
     13    <div id="content"><h3>Alerting Service for Greenstone &ndash; About</h3>
     14        <p></p>
    1415   
    15     <tr>
    16       <td align="right"></td>
    17     </tr>
    1816   
    19     <tr>
    20       <td colspan="2"></td>
    21     </tr>
    22       </tbody></table>
    23     </center>
    24     <!-- end of page banner -->
    25    
    26     <center>
    27      
    28       <table width="537">
    29     <tbody><tr><td><h3>Alerting Service for Greenstone 3 &ndash; About</h3></td></tr>
    30     <tr><td>&nbsp;</td></tr>
    31     <tr><td>Here be text</td></tr>
    32     <tr><td>&nbsp;</td></tr>
    33     <tr><td><p>Go <a href="index.html">back</a> to the alerting service.</p></td></tr>
    34       </tbody></table>
    35     </center>
     17    (description of what an alerting service does)<br/>
     18    <a href="index.html">back</a> to the alerting service.<br/>
     19    </div>
    3620  </body></html>

  • trunk/greenstone3-extensions/gsdl-as/web/default.css

    r8630 r8720  
    11body {
    2     font-family: "Trebuchet MS",Arial,helvetica,sans-serif;
     2    color:             black;
     3    background-color:  white;
     4    /*font-family:       "Trebuchet MS", Arial, helvetica, sans-serif;*/
     5    text-align:        center;
     6    margin:            0px;
     7    background-image:  url("images/chalk.gif");
     8    background-repeat: repeat-y;
    39}
    410
     11#content {
     12    background-image: url("images/gsdlhead.gif");
     13    background-repeat: no-repeat;
     14    background-position: center top;
     15    padding-top:  88px;
     16    width:        537px;
     17    position:     relative;
     18    text-align:   left;
     19    margin-left:  auto;
     20    margin-right: auto;
     21    margin-top:   10px;
     22}
     23
     24
    525.error {
    6     color: red;
    7     font-weight: bold;
     26        color: red;
     27        font-weight: bold;
    828}
    929
    1030.details {
    11     font-size: small;
     31        font-size: small;
    1232}
    1333
    1434table, thead {
    15     border: 1pt solid black;
     35        border: 1pt solid black;
    1636}
    1737
    1838thead {
    19     background-color: gray;
     39        background-color: gray;
    2040}
     41
     42a:link {
     43    color: #006666;
     44}
     45
     46a:active {
     47    color: #cc9900;
     48}
     49
     50a:visited {
     51    color: #666633;
     52}
     53
     54img.help {
     55    cursor: help;
     56}

  • trunk/greenstone3-extensions/gsdl-as/web/index.html

    r8644 r8720  
    1 <html><head>
    2     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
    3       <title>Greenstone Version 3</title></head>
    4 
    5   <body alink="#cc9900" background="images/chalk.gif" bgcolor="#ffffff" link="#006666" text="#000000" vlink="#666633">
     1<?xml version="1.0"?>
     2<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     3    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
     4<html xmlns="http://www.w3.org/1999/xhtml">
     5    <head>
     6        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     7        <title>Greenstone Version 3</title>
     8        <link rel="stylesheet" type="text/css" href="default.css"/>
     9    </head>
     10    <body>
    611   
    712    <!-- page banner (_style:pagebanner_) -->
    8     <center>
    9       <table cellpadding="0" cellspacing="0" width="537">
    10     <tbody><tr valign="top">
    11       <td rowspan="2" align="left"><center><img src="images/gsdlhead.gif" alt="Greenstone Digital Library Software" height="100" width="300"></center></td>
    12       <td align="right"></td>
    13     </tr>
    14    
    15     <tr>
    16       <td align="right"></td>
    17     </tr>
    18    
    19     <tr>
    20       <td colspan="2"></td>
    21     </tr>
    22       </tbody></table>
    23     </center>
    24     <!-- end of page banner -->
    25    
    26     <center>
    27      
    28       <table width="537">
    29     <tbody><tr><td><h3>Alerting Service for Greenstone 3</h3></td></tr>
    30     <tr><td>&nbsp;</td></tr>
    31     <tr><td>What do you want to do today?</td></tr>
    32     <tr><td>&nbsp;</td></tr>
    33    
    34    
    35     <tr><td><a href="test.html">Test</a> the alerting service servlet.</td></tr>
    36     <tr><td><a href="service?action=listSubscriptions">List</a> the existing subscriptions.</td></tr>
    37     <tr><td><a href="about.html">Read more</a> about the alerting service.</td></tr>
    38        
    39       </tbody></table>
    40     </center>
    41   </body></html>
     13        <div id="content">
     14            <h3>Alerting Service for Greenstone</h3>
     15            <p>What do you want to do today?</p>
     16           
     17            <ul>
     18                <li>
     19                    <a href="subscribe.html">Create</a> a subscription.</li>
     20                <li>
     21                    <a href="service?action=listSubscriptions">View and edit</a> your existing subscriptions.</li>
     22                <li>
     23                    <a href="about.html">Read more</a> about the alerting service.</li>
     24            </ul>
     25        </div>
     26    </body>
     27</html>

  • trunk/greenstone3-extensions/gsdl-as/web/test.html

    r8644 r8720  
     1<?xml version="1.0"?>
    12<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    2      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    3 <html>
     3    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
     4<html xmlns="http://www.w3.org/1999/xhtml">
    45    <head>
    56        <title>Alerting Service for Greenstone</title>
     7        <link href="default.css" rel="stylesheet" type="text/css"/>
    68        <style type="text/css">
    79        <!--
    … …  
    1012        th,td { border-width:0px; }
    1113        -->
    12         </style
     14        </style>
    1315    </head>
    1416    <body>
    15         <h1>Test</h1>
    16         <form action="/alerting/service?test" method="POST">
     17        <div id="content">
     18        <!-- <h1>Test</h1>
     19        <form action="/alerting/service?test" method="post">
    1720            <input type="text" name="text"/><br/>
    1821            <input type="submit" value="submit"/>
    1922        </form>
    20         <hr/>
     23        <hr/> -->
    2124       
    22         <h1>Subscribe</h1>
    23         <form action="/alerting/service" method="POST" name="subscribe">
     25        <h3>Subscribe</h3>
     26        <form action="/alerting/service" method="post" name="subscribe">
    2427            <input type="hidden" name="action" value="subscribe"/>
    2528            <table border="1">
    … …  
    6164            <input type="submit" value="submit"/>
    6265        </form>
     66        </div>
    6367    </body>
    6468</html>

  • trunk/gsdl3/extensions/gsdl-as/lib/templates/error.vm

    r8630 r8720  
    33    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    44<html xmlns="http://www.w3.org/1999/xhtml">
    5 <head>
    6 <title>Greenstone Digital Library Software</title>
    7 <link href="default.css" rel="stylesheet" type="text/css"/>
    8 </head>
    9 <body>
    10 <h1>Alerting Service for Greenstone</h1>
    11 <h2>$title</h2>
    12 <div class="content">
    13 <p class="error">$message</p>
    14 <p class="details">$details</p>
    15 </div>
     5    <head>
     6        <title>Greenstone Digital Library Software</title>
     7        <link href="default.css" rel="stylesheet" type="text/css"/>
     8    </head>
     9    <body>
     10        <div id="content">
     11            <h3>Alerting Service for Greenstone</h3>
     12            <p>$title</p>
     13            <p class="error">$message</p>
     14            <p class="details">$details</p>
     15            <a href="/alerting">back</a> to the alerting service
     16        </div>
    1617
    17 </body>
     18    </body>
    1819</html>

  • trunk/gsdl3/extensions/gsdl-as/lib/templates/general.vm

    r8630 r8720  
    88</head>
    99<body>
    10 <h1>Alerting Service for Greenstone</h1>
    11 <h2>$title</h2>
    12 <div class="content">
     10<div id="content">
     11<h3>Alerting Service for Greenstone</h3>
     12<p>$title</p>
    1313<p class="message">$message</p>
     14<a href="/alerting">back</a> to the alerting service
    1415</div>
    1516

  • trunk/gsdl3/extensions/gsdl-as/lib/templates/list.vm

    r8630 r8720  
    55<head>
    66<title>Greenstone Digital Library Software</title>
    7 <link href="default.css" rel="stylesheet" type="text/css"/>
     7<link href="list.css" rel="stylesheet" type="text/css"/>
    88</head>
    99<body>
    10 <h1>Alerting Service for Greenstone</h1>
    11 <h2>$title</h2>
    12 <div class="content">
     10<div id="content">
     11<h3>Alerting Service for Greenstone</h3>
     12<p>$title</p>
    1313#foreach($sub in $list)
    1414    <div class="subscription">
    15         <span class="sub_id">$sub.Id</span>
    16         <table>
     15        <p><span class="sub_id">Subscription $sub.Id</span><br/>
     16        <a href="service?action=showFeed&subscriptionID=$sub.Id">show matching events</a> | <a href="service?action=editSubscription&subscriptionID=$sub.Id">edit subscription</a></p>
     17        <table class="subscription">
    1718            <thead>
    1819                <tr><th>Field</th><th>Predicate</th></tr>
    1920            </thead>
    20             <tfoot/>
     21            <tfoot><tr><th/><th/></tr></tfoot>
    2122            <tbody>
    2223                #foreach($pred in $sub.Predicates)
    … …  
    2829            </tbody>
    2930        </table>
     31        <br/>
    3032    </div>
    3133#end
     34<a href="/alerting">back</a> to the alerting service
    3235</div>
    3336

  • trunk/gsdl3/extensions/gsdl-as/src/org/greenstone/gsdlas/GreenstoneCommunicator.java

    r8609 r8720  
    99package org.greenstone.gsdlas;
    1010
     11import java.io.OutputStreamWriter;
    1112import java.net.URL;
    1213import java.util.*;
    … …  
    1718import org.apache.soap.Fault;
    1819import org.apache.soap.rpc.*;
     20import org.apache.soap.util.xml.DOM2Writer;
    1921import org.w3c.dom.*;
    2022
    … …  
    119121       
    120122        Set result = new TreeSet();
     123        //DOM2Writer.serializeAsXML(root, new OutputStreamWriter(System.out));
    121124       
    122125        Element response = sendToGreenstone(document.getDocumentElement());

  • trunk/gsdl3/extensions/gsdl-as/src/org/greenstone/gsdlas/profiles/PredicateFactory.java

    r8609 r8720  
    4646            throws ParseException {
    4747        Predicate result = null;
     48        if (value == null || value.length() == 0) {
     49            return null;
     50        }
     51       
    4852        if (key.equals("type")) {
    4953            return result;

  • trunk/gsdl3/extensions/gsdl-as/web/about.html

    r8630 r8720  
    1 <html><head>
    2     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
    3       <title>Greenstone Version 3</title></head>
    4 
    5   <body alink="#cc9900" background="images/chalk.gif" bgcolor="#ffffff" link="#006666" text="#000000" vlink="#666633">
     1<?xml version="1.0"?>
     2<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     3    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
     4<html xmlns="http://www.w3.org/1999/xhtml">
     5<head>
     6    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     7      <title>Greenstone Version 3</title>
     8            <link rel="stylesheet" type="text/css" href="default.css"/>
     9            </head>
     10  <body>
    611   
    712    <!-- page banner (_style:pagebanner_) -->
    8     <center>
    9       <table cellpadding="0" cellspacing="0" width="537">
    10     <tbody><tr valign="top">
    11       <td rowspan="2" align="left"><center><img src="images/gsdlhead.gif" alt="Greenstone Digital Library Software" height="100" width="300"></center></td>
    12       <td align="right"></td>
    13     </tr>
     13    <div id="content"><h3>Alerting Service for Greenstone &ndash; About</h3>
     14        <p></p>
    1415   
    15     <tr>
    16       <td align="right"></td>
    17     </tr>
    1816   
    19     <tr>
    20       <td colspan="2"></td>
    21     </tr>
    22       </tbody></table>
    23     </center>
    24     <!-- end of page banner -->
    25    
    26     <center>
    27      
    28       <table width="537">
    29     <tbody><tr><td><h3>Alerting Service for Greenstone 3 &ndash; About</h3></td></tr>
    30     <tr><td>&nbsp;</td></tr>
    31     <tr><td>Here be text</td></tr>
    32     <tr><td>&nbsp;</td></tr>
    33     <tr><td><p>Go <a href="index.html">back</a> to the alerting service.</p></td></tr>
    34       </tbody></table>
    35     </center>
     17    (description of what an alerting service does)<br/>
     18    <a href="index.html">back</a> to the alerting service.<br/>
     19    </div>
    3620  </body></html>

  • trunk/gsdl3/extensions/gsdl-as/web/default.css

    r8630 r8720  
    11body {
    2     font-family: "Trebuchet MS",Arial,helvetica,sans-serif;
     2    color:             black;
     3    background-color:  white;
     4    /*font-family:       "Trebuchet MS", Arial, helvetica, sans-serif;*/
     5    text-align:        center;
     6    margin:            0px;
     7    background-image:  url("images/chalk.gif");
     8    background-repeat: repeat-y;
    39}
    410
     11#content {
     12    background-image: url("images/gsdlhead.gif");
     13    background-repeat: no-repeat;
     14    background-position: center top;
     15    padding-top:  88px;
     16    width:        537px;
     17    position:     relative;
     18    text-align:   left;
     19    margin-left:  auto;
     20    margin-right: auto;
     21    margin-top:   10px;
     22}
     23
     24
    525.error {
    6     color: red;
    7     font-weight: bold;
     26        color: red;
     27        font-weight: bold;
    828}
    929
    1030.details {
    11     font-size: small;
     31        font-size: small;
    1232}
    1333
    1434table, thead {
    15     border: 1pt solid black;
     35        border: 1pt solid black;
    1636}
    1737
    1838thead {
    19     background-color: gray;
     39        background-color: gray;
    2040}
     41
     42a:link {
     43    color: #006666;
     44}
     45
     46a:active {
     47    color: #cc9900;
     48}
     49
     50a:visited {
     51    color: #666633;
     52}
     53
     54img.help {
     55    cursor: help;
     56}

  • trunk/gsdl3/extensions/gsdl-as/web/index.html

    r8644 r8720  
    1 <html><head>
    2     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
    3       <title>Greenstone Version 3</title></head>
    4 
    5   <body alink="#cc9900" background="images/chalk.gif" bgcolor="#ffffff" link="#006666" text="#000000" vlink="#666633">
     1<?xml version="1.0"?>
     2<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     3    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
     4<html xmlns="http://www.w3.org/1999/xhtml">
     5    <head>
     6        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     7        <title>Greenstone Version 3</title>
     8        <link rel="stylesheet" type="text/css" href="default.css"/>
     9    </head>
     10    <body>
    611   
    712    <!-- page banner (_style:pagebanner_) -->
    8     <center>
    9       <table cellpadding="0" cellspacing="0" width="537">
    10     <tbody><tr valign="top">
    11       <td rowspan="2" align="left"><center><img src="images/gsdlhead.gif" alt="Greenstone Digital Library Software" height="100" width="300"></center></td>
    12       <td align="right"></td>
    13     </tr>
    14    
    15     <tr>
    16       <td align="right"></td>
    17     </tr>
    18    
    19     <tr>
    20       <td colspan="2"></td>
    21     </tr>
    22       </tbody></table>
    23     </center>
    24     <!-- end of page banner -->
    25    
    26     <center>
    27      
    28       <table width="537">
    29     <tbody><tr><td><h3>Alerting Service for Greenstone 3</h3></td></tr>
    30     <tr><td>&nbsp;</td></tr>
    31     <tr><td>What do you want to do today?</td></tr>
    32     <tr><td>&nbsp;</td></tr>
    33    
    34    
    35     <tr><td><a href="test.html">Test</a> the alerting service servlet.</td></tr>
    36     <tr><td><a href="service?action=listSubscriptions">List</a> the existing subscriptions.</td></tr>
    37     <tr><td><a href="about.html">Read more</a> about the alerting service.</td></tr>
    38        
    39       </tbody></table>
    40     </center>
    41   </body></html>
     13        <div id="content">
     14            <h3>Alerting Service for Greenstone</h3>
     15            <p>What do you want to do today?</p>
     16           
     17            <ul>
     18                <li>
     19                    <a href="subscribe.html">Create</a> a subscription.</li>
     20                <li>
     21                    <a href="service?action=listSubscriptions">View and edit</a> your existing subscriptions.</li>
     22                <li>
     23                    <a href="about.html">Read more</a> about the alerting service.</li>
     24            </ul>
     25        </div>
     26    </body>
     27</html>

  • trunk/gsdl3/extensions/gsdl-as/web/test.html

    r8644 r8720  
     1<?xml version="1.0"?>
    12<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    2      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    3 <html>
     3    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
     4<html xmlns="http://www.w3.org/1999/xhtml">
    45    <head>
    56        <title>Alerting Service for Greenstone</title>
     7        <link href="default.css" rel="stylesheet" type="text/css"/>
    68        <style type="text/css">
    79        <!--
    … …  
    1012        th,td { border-width:0px; }
    1113        -->
    12         </style
     14        </style>
    1315    </head>
    1416    <body>
    15         <h1>Test</h1>
    16         <form action="/alerting/service?test" method="POST">
     17        <div id="content">
     18        <!-- <h1>Test</h1>
     19        <form action="/alerting/service?test" method="post">
    1720            <input type="text" name="text"/><br/>
    1821            <input type="submit" value="submit"/>
    1922        </form>
    20         <hr/>
     23        <hr/> -->
    2124       
    22         <h1>Subscribe</h1>
    23         <form action="/alerting/service" method="POST" name="subscribe">
     25        <h3>Subscribe</h3>
     26        <form action="/alerting/service" method="post" name="subscribe">
    2427            <input type="hidden" name="action" value="subscribe"/>
    2528            <table border="1">
    … …  
    6164            <input type="submit" value="submit"/>
    6265        </form>
     66        </div>
    6367    </body>
    6468</html>

  • trunk/gsdl3/packages/gsdl-as/lib/templates/error.vm

    r8630 r8720  
    33    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    44<html xmlns="http://www.w3.org/1999/xhtml">
    5 <head>
    6 <title>Greenstone Digital Library Software</title>
    7 <link href="default.css" rel="stylesheet" type="text/css"/>
    8 </head>
    9 <body>
    10 <h1>Alerting Service for Greenstone</h1>
    11 <h2>$title</h2>
    12 <div class="content">
    13 <p class="error">$message</p>
    14 <p class="details">$details</p>
    15 </div>
     5    <head>
     6        <title>Greenstone Digital Library Software</title>
     7        <link href="default.css" rel="stylesheet" type="text/css"/>
     8    </head>
     9    <body>
     10        <div id="content">
     11            <h3>Alerting Service for Greenstone</h3>
     12            <p>$title</p>
     13            <p class="error">$message</p>
     14            <p class="details">$details</p>
     15            <a href="/alerting">back</a> to the alerting service
     16        </div>
    1617
    17 </body>
     18    </body>
    1819</html>

  • trunk/gsdl3/packages/gsdl-as/lib/templates/general.vm

    r8630 r8720  
    88</head>
    99<body>
    10 <h1>Alerting Service for Greenstone</h1>
    11 <h2>$title</h2>
    12 <div class="content">
     10<div id="content">
     11<h3>Alerting Service for Greenstone</h3>
     12<p>$title</p>
    1313<p class="message">$message</p>
     14<a href="/alerting">back</a> to the alerting service
    1415</div>
    1516

  • trunk/gsdl3/packages/gsdl-as/lib/templates/list.vm

    r8630 r8720  
    55<head>
    66<title>Greenstone Digital Library Software</title>
    7 <link href="default.css" rel="stylesheet" type="text/css"/>
     7<link href="list.css" rel="stylesheet" type="text/css"/>
    88</head>
    99<body>
    10 <h1>Alerting Service for Greenstone</h1>
    11 <h2>$title</h2>
    12 <div class="content">
     10<div id="content">
     11<h3>Alerting Service for Greenstone</h3>
     12<p>$title</p>
    1313#foreach($sub in $list)
    1414    <div class="subscription">
    15         <span class="sub_id">$sub.Id</span>
    16         <table>
     15        <p><span class="sub_id">Subscription $sub.Id</span><br/>
     16        <a href="service?action=showFeed&subscriptionID=$sub.Id">show matching events</a> | <a href="service?action=editSubscription&subscriptionID=$sub.Id">edit subscription</a></p>
     17        <table class="subscription">
    1718            <thead>
    1819                <tr><th>Field</th><th>Predicate</th></tr>
    1920            </thead>
    20             <tfoot/>
     21            <tfoot><tr><th/><th/></tr></tfoot>
    2122            <tbody>
    2223                #foreach($pred in $sub.Predicates)
    … …  
    2829            </tbody>
    2930        </table>
     31        <br/>
    3032    </div>
    3133#end
     34<a href="/alerting">back</a> to the alerting service
    3235</div>
    3336

  • trunk/gsdl3/packages/gsdl-as/src/org/greenstone/gsdlas/GreenstoneCommunicator.java

    r8609 r8720  
    99package org.greenstone.gsdlas;
    1010
     11import java.io.OutputStreamWriter;
    1112import java.net.URL;
    1213import java.util.*;
    … …  
    1718import org.apache.soap.Fault;
    1819import org.apache.soap.rpc.*;
     20import org.apache.soap.util.xml.DOM2Writer;
    1921import org.w3c.dom.*;
    2022
    … …  
    119121       
    120122        Set result = new TreeSet();
     123        //DOM2Writer.serializeAsXML(root, new OutputStreamWriter(System.out));
    121124       
    122125        Element response = sendToGreenstone(document.getDocumentElement());

  • trunk/gsdl3/packages/gsdl-as/src/org/greenstone/gsdlas/profiles/PredicateFactory.java

    r8609 r8720  
    4646            throws ParseException {
    4747        Predicate result = null;
     48        if (value == null || value.length() == 0) {
     49            return null;
     50        }
     51       
    4852        if (key.equals("type")) {
    4953            return result;

  • trunk/gsdl3/packages/gsdl-as/web/about.html

    r8630 r8720  
    1 <html><head>
    2     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
    3       <title>Greenstone Version 3</title></head>
    4 
    5   <body alink="#cc9900" background="images/chalk.gif" bgcolor="#ffffff" link="#006666" text="#000000" vlink="#666633">
     1<?xml version="1.0"?>
     2<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     3    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
     4<html xmlns="http://www.w3.org/1999/xhtml">
     5<head>
     6    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     7      <title>Greenstone Version 3</title>
     8            <link rel="stylesheet" type="text/css" href="default.css"/>
     9            </head>
     10  <body>
    611   
    712    <!-- page banner (_style:pagebanner_) -->
    8     <center>
    9       <table cellpadding="0" cellspacing="0" width="537">
    10     <tbody><tr valign="top">
    11       <td rowspan="2" align="left"><center><img src="images/gsdlhead.gif" alt="Greenstone Digital Library Software" height="100" width="300"></center></td>
    12       <td align="right"></td>
    13     </tr>
     13    <div id="content"><h3>Alerting Service for Greenstone &ndash; About</h3>
     14        <p></p>
    1415   
    15     <tr>
    16       <td align="right"></td>
    17     </tr>
    1816   
    19     <tr>
    20       <td colspan="2"></td>
    21     </tr>
    22       </tbody></table>
    23     </center>
    24     <!-- end of page banner -->
    25    
    26     <center>
    27      
    28       <table width="537">
    29     <tbody><tr><td><h3>Alerting Service for Greenstone 3 &ndash; About</h3></td></tr>
    30     <tr><td>&nbsp;</td></tr>
    31     <tr><td>Here be text</td></tr>
    32     <tr><td>&nbsp;</td></tr>
    33     <tr><td><p>Go <a href="index.html">back</a> to the alerting service.</p></td></tr>
    34       </tbody></table>
    35     </center>
     17    (description of what an alerting service does)<br/>
     18    <a href="index.html">back</a> to the alerting service.<br/>
     19    </div>
    3620  </body></html>

  • trunk/gsdl3/packages/gsdl-as/web/default.css

    r8630 r8720  
    11body {
    2     font-family: "Trebuchet MS",Arial,helvetica,sans-serif;
     2    color:             black;
     3    background-color:  white;
     4    /*font-family:       "Trebuchet MS", Arial, helvetica, sans-serif;*/
     5    text-align:        center;
     6    margin:            0px;
     7    background-image:  url("images/chalk.gif");
     8    background-repeat: repeat-y;
    39}
    410
     11#content {
     12    background-image: url("images/gsdlhead.gif");
     13    background-repeat: no-repeat;
     14    background-position: center top;
     15    padding-top:  88px;
     16    width:        537px;
     17    position:     relative;
     18    text-align:   left;
     19    margin-left:  auto;
     20    margin-right: auto;
     21    margin-top:   10px;
     22}
     23
     24
    525.error {
    6     color: red;
    7     font-weight: bold;
     26        color: red;
     27        font-weight: bold;
    828}
    929
    1030.details {
    11     font-size: small;
     31        font-size: small;
    1232}
    1333
    1434table, thead {
    15     border: 1pt solid black;
     35        border: 1pt solid black;
    1636}
    1737
    1838thead {
    19     background-color: gray;
     39        background-color: gray;
    2040}
     41
     42a:link {
     43    color: #006666;
     44}
     45
     46a:active {
     47    color: #cc9900;
     48}
     49
     50a:visited {
     51    color: #666633;
     52}
     53
     54img.help {
     55    cursor: help;
     56}

  • trunk/gsdl3/packages/gsdl-as/web/index.html

    r8644 r8720  
    1 <html><head>
    2     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
    3       <title>Greenstone Version 3</title></head>
    4 
    5   <body alink="#cc9900" background="images/chalk.gif" bgcolor="#ffffff" link="#006666" text="#000000" vlink="#666633">
     1<?xml version="1.0"?>
     2<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     3    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
     4<html xmlns="http://www.w3.org/1999/xhtml">
     5    <head>
     6        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     7        <title>Greenstone Version 3</title>
     8        <link rel="stylesheet" type="text/css" href="default.css"/>
     9    </head>
     10    <body>
    611   
    712    <!-- page banner (_style:pagebanner_) -->
    8     <center>
    9       <table cellpadding="0" cellspacing="0" width="537">
    10     <tbody><tr valign="top">
    11       <td rowspan="2" align="left"><center><img src="images/gsdlhead.gif" alt="Greenstone Digital Library Software" height="100" width="300"></center></td>
    12       <td align="right"></td>
    13     </tr>
    14    
    15     <tr>
    16       <td align="right"></td>
    17     </tr>
    18    
    19     <tr>
    20       <td colspan="2"></td>
    21     </tr>
    22       </tbody></table>
    23     </center>
    24     <!-- end of page banner -->
    25    
    26     <center>
    27      
    28       <table width="537">
    29     <tbody><tr><td><h3>Alerting Service for Greenstone 3</h3></td></tr>
    30     <tr><td>&nbsp;</td></tr>
    31     <tr><td>What do you want to do today?</td></tr>
    32     <tr><td>&nbsp;</td></tr>
    33    
    34    
    35     <tr><td><a href="test.html">Test</a> the alerting service servlet.</td></tr>
    36     <tr><td><a href="service?action=listSubscriptions">List</a> the existing subscriptions.</td></tr>
    37     <tr><td><a href="about.html">Read more</a> about the alerting service.</td></tr>
    38        
    39       </tbody></table>
    40     </center>
    41   </body></html>
     13        <div id="content">
     14            <h3>Alerting Service for Greenstone</h3>
     15            <p>What do you want to do today?</p>
     16           
     17            <ul>
     18                <li>
     19                    <a href="subscribe.html">Create</a> a subscription.</li>
     20                <li>
     21                    <a href="service?action=listSubscriptions">View and edit</a> your existing subscriptions.</li>
     22                <li>
     23                    <a href="about.html">Read more</a> about the alerting service.</li>
     24            </ul>
     25        </div>
     26    </body>
     27</html>

  • trunk/gsdl3/packages/gsdl-as/web/test.html

    r8644 r8720  
     1<?xml version="1.0"?>
    12<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    2      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    3 <html>
     3    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
     4<html xmlns="http://www.w3.org/1999/xhtml">
    45    <head>
    56        <title>Alerting Service for Greenstone</title>
     7        <link href="default.css" rel="stylesheet" type="text/css"/>
    68        <style type="text/css">
    79        <!--
    … …  
    1012        th,td { border-width:0px; }
    1113        -->
    12         </style
     14        </style>
    1315    </head>
    1416    <body>
    15         <h1>Test</h1>
    16         <form action="/alerting/service?test" method="POST">
     17        <div id="content">
     18        <!-- <h1>Test</h1>
     19        <form action="/alerting/service?test" method="post">
    1720            <input type="text" name="text"/><br/>
    1821            <input type="submit" value="submit"/>
    1922        </form>
    20         <hr/>
     23        <hr/> -->
    2124       
    22         <h1>Subscribe</h1>
    23         <form action="/alerting/service" method="POST" name="subscribe">
     25        <h3>Subscribe</h3>
     26        <form action="/alerting/service" method="post" name="subscribe">
    2427            <input type="hidden" name="action" value="subscribe"/>
    2528            <table border="1">
    … …  
    6164            <input type="submit" value="submit"/>
    6265        </form>
     66        </div>
    6367    </body>
    6468</html>
Note: See TracChangeset for help on using the changeset viewer.