Changeset 1537


Ignore:
Timestamp:
Feb 16, 2012, 11:39:54 AM (11 years ago)
Author:
Nicklas Nordborg
Message:

Fixes #359: Changes related to new GUI in BASE 3.1

Location:
extensions/net.sf.basedb.examples/trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.examples/trunk/.classpath

    r1348 r1537  
    55  <classpathentry kind="lib" path="lib/compile/jsp-api.jar"/>
    66  <classpathentry kind="lib" path="lib/compile/servlet-api.jar"/>
    7   <classpathentry kind="lib" path="lib/compile/base-core-3.0.0.jar"/>
    8   <classpathentry kind="lib" path="lib/compile/base-webclient-3.0.0.jar"/>
     7  <classpathentry kind="lib" path="lib/compile/base-core-3.1.0.jar"/>
     8  <classpathentry kind="lib" path="lib/compile/base-webclient-3.1.0.jar"/>
    99  <classpathentry kind="output" path="bin"/>
    1010</classpath>
  • extensions/net.sf.basedb.examples/trunk/META-INF/extensions.xml

    r1435 r1537  
    3030    </description>
    3131    <version>1.4-dev</version>
    32     <min-base-version>3.0.0</min-base-version>
     32    <min-base-version>3.1.0</min-base-version>
    3333    <copyright>BASE development team</copyright>
    3434    <url>http://baseplugins.thep.lu.se/wiki/net.sf.basedb.examples.extensions</url>
     
    7676        <title>Hello world examples!</title>
    7777        <tooltip>Find all examples here</tooltip>
    78         <icon>/images/info.gif</icon>
     78        <icon>/images/info.png</icon>
    7979      </parameters>
    8080    </action-factory>
     
    102102        <tooltip>This is to test the extensions system</tooltip>
    103103        <onClick>alert('Hello world!')</onClick>
    104         <icon>/images/info.gif</icon>
     104        <icon>/images/info.png</icon>
    105105      </parameters>
    106106    </action-factory>
     
    170170        <title>Hello JSP world!</title>
    171171        <tooltip>Opens a JSP page with the message</tooltip>
    172         <onClick>Main.openPopup('$HOME$/hello_world.jsp?ID=' + getSessionId(), 'HelloJspWorld', 400, 300)</onClick>
     172        <onClick>Main.openPopup('$HOME$/hello_world.jsp?ID=' + getSessionId(), 'HelloJspWorld', 450, 300)</onClick>
    173173        <icon>~/images/world.png</icon>
    174174      </parameters>
     
    198198        <title>Hello X-JSP world!</title>
    199199        <tooltip>Opens a X-JSP page with the message</tooltip>
    200         <onClick>Main.openPopup('$HOME$/hello_world.xjsp?ID=' + getSessionId(), 'HelloXJspWorld', 400, 300)</onClick>
     200        <onClick>Main.openPopup('$HOME$/hello_world.xjsp?ID=' + getSessionId(), 'HelloXJspWorld', 450, 300)</onClick>
    201201        <icon>~/images/xworld.png</icon>
    202202      </parameters>
     
    223223        <title>Hello Servlet world!</title>
    224224        <tooltip>Opens a Servlet generated page with the message</tooltip>
    225         <onClick>Main.openPopup('$HOME$/HelloWorld/with/some/path-info.servlet?ID=' + getSessionId(), 'HelloServletWorld', 400, 300)</onClick>
     225        <onClick>Main.openPopup('$HOME$/HelloWorld/with/some/path-info.servlet?ID=' + getSessionId(), 'HelloServletWorld', 450, 300)</onClick>
    226226        <icon>~/images/servlet.png</icon>
    227227      </parameters>
     
    250250        <title>Hello Servlet world (alternate)!</title>
    251251        <tooltip>Opens a Servlet generated page with the message</tooltip>
    252         <onClick>Main.openPopup('$SERVLET_HOME$/HelloWorld/with/other/path?ID=' + getSessionId(), 'HelloServletWorld', 400, 300)</onClick>
     252        <onClick>Main.openPopup('$SERVLET_HOME$/HelloWorld/with/other/path?ID=' + getSessionId(), 'HelloServletWorld', 450, 300)</onClick>
    253253        <icon>~/images/servlet.png</icon>
    254254      </parameters>
     
    275275        <title>More info...</title>
    276276        <tooltip>Show some information about $NAME</tooltip>
    277         <icon>/images/info.gif</icon>
     277        <icon>/images/info.png</icon>
    278278        <onClick>Examples.showItemInfo('$TYPE', $ID)</onClick>
    279279        <script>~/scripts/examples.jsp</script>
     
    301301        <title>Annotation filter...</title>
    302302        <tooltip>Filter items based on if they have been annotated or not</tooltip>
    303         <icon>/images/filter.gif</icon>
     303        <icon>/images/filter.png</icon>
    304304        <onClick>Examples.filterAnnotated('$TYPE')</onClick>
    305305        <script>~/scripts/examples.jsp</script>
  • extensions/net.sf.basedb.examples/trunk/README

    r1433 r1537  
    11== Requirements ==
    22
    3  1. BASE 3.0 or later.
     3 1. BASE 3.1 or later.
    44 
    55== Introduction ==
     
    7171 1. Type `ant download-lib` to automatically download the BASE core JAR file that
    7272    are neeed for compilation. You can also do this manually by copying the
    73     base-core-3.0.0.jar and base-webclient-3.0.0.jar files from the BASE installation
     73    base-core-3.1.0.jar and base-webclient-3.1.0.jar files from the BASE installation
    7474    directory (<basedir>/www/WEB-INF/lib/) to the ./lib/compile directory.
    7575
  • extensions/net.sf.basedb.examples/trunk/build.xml

    r1435 r1537  
    4242  <property name="javac.encoding" value="UTF-8" />
    4343  <property name="depend.base-version"
    44     value="3.0.0"
     44    value="3.1.0"
    4545    description="The BASE version that this project depends on."
    4646  />
  • extensions/net.sf.basedb.examples/trunk/lib/compile/readme.txt

    r1346 r1537  
    44root directory to download those files automatically.
    55
    6  * base-core-3.0.0.jar
    7  * base-webclient-3.0.0.jar
     6 * base-core-3.1.0.jar
     7 * base-webclient-3.1.0.jar
  • extensions/net.sf.basedb.examples/trunk/resources/filter_annotated.jsp

    r1391 r1537  
    6565  </base:head>
    6666  <base:body>
     67    <h1>Annotation filter</h1>
     68   
    6769    <form name="filter">
    68     <h3 class="docked">Annotation filter</h3>
    69     <div class="boxedbottom">
    70       <input type="radio" name="what" value="<>"
    71         <%=operator == Operator.NEQ ? "checked" : "" %>
    72         ><a href="javascript:select('<>')">Show only items with annotations</a><br>
    73       <input type="radio" name="what" value="="
    74         <%=operator == Operator.EQ ? "checked" : "" %>
    75         ><a href="javascript:select('=')">Show only item without annotations</a><br>
    76       <input type="radio" name="what" value=""
    77         <%=operator == null ? "checked" : "" %>
    78         ><a href="javascript:select('')">Show all items</a><br>
     70    <div class="content bottomborder">
     71      <table class="fullform smaller">
     72      <tr class="dynamic">
     73        <th>Filter</th>
     74        <td>
     75          <input type="radio" name="what" value="<>"
     76            <%=operator == Operator.NEQ ? "checked" : "" %>
     77            ><a href="javascript:select('<>')">Show only items with annotations</a><br>
     78          <input type="radio" name="what" value="="
     79            <%=operator == Operator.EQ ? "checked" : "" %>
     80            ><a href="javascript:select('=')">Show only item without annotations</a><br>
     81          <input type="radio" name="what" value=""
     82            <%=operator == null ? "checked" : "" %>
     83            ><a href="javascript:select('')">Show all items</a><br>
     84        </td>
     85      </tr>
     86      </table>
    7987    </div>
    80     <br>
    81     <table align="center">
    82     <tr>
    83       <td><base:button onclick="applyFilter()" title="Ok" /></td>
    84       <td><base:button onclick="window.close()" title="Cancel" /></td>
    85     </tr>
    86     </table>
    8788    </form>
     89   
     90    <base:buttongroup subclass="dialogbuttons">
     91      <base:button onclick="applyFilter()" title="Ok" />
     92      <base:button onclick="window.close()" title="Cancel" />
     93    </base:buttongroup>
    8894  </base:body>
    8995  </base:page>
  • extensions/net.sf.basedb.examples/trunk/resources/hello_world.jsp

    r1391 r1537  
    4141  <base:head />
    4242  <base:body>
    43     <h3 class="docked">Hello <%=HTML.encodeTags(current.getName())%></h3>
    44     <div class="boxedbottom">
    45       Here are your settings:
    46       <table class="form" border="0" cellspacing="1" cellpadding="2">
     43    <h1>Hello <%=HTML.encodeTags(current.getName())%></h1>
     44    <div class="content bottomborder">
     45      <table class="fullform">
    4746      <tr>
    48         <td class="prompt">Session ID</td>
     47        <th>Session ID</th>
    4948        <td><%=ID%></td>
    5049      </tr>
    5150      <tr>
    52         <td class="prompt">Login</td>
     51        <th>Login</th>
    5352        <td><%=HTML.encodeTags(current.getLogin())%></td>
    5453      </tr>
    55       <tr>
    56         <td class="prompt">Email</td>
     54      <tr class="dynamic">
     55        <th>Email</th>
    5756        <td><%=HTML.niceFormat(current.getEmail())%></td>
    5857      </tr>
    5958      </table>
    6059    </div>
    61     <br>
    62     <table align="center">
    63     <tr>
    64       <td><base:button onclick="window.close()" title="Close" /></td>
    65     </tr>
    66     </table>
    67     </form>
     60
     61    <base:buttongroup subclass="dialogbuttons">
     62      <base:button onclick="window.close()" title="Close" />
     63    </base:buttongroup>
     64
    6865  </base:body>
    6966  </base:page>
  • extensions/net.sf.basedb.examples/trunk/resources/hello_world.xjsp

    r1391 r1537  
    3535  <base:head />
    3636  <base:body>
    37     <h3 class="docked">Hello <%=HTML.encodeTags(current.getName())%></h3>
    38     <div class="boxedbottom">
    39       Here are your X-JSP settings:
    40       <table class="form" border="0" cellspacing="1" cellpadding="2">
     37    <h1>Hello <%=HTML.encodeTags(current.getName())%></h1>
     38    <div class="content bottomborder">
     39      <table class="fullform">
    4140      <tr>
    42         <td class="prompt">Session ID</td>
     41        <th>Session ID</th>
    4342        <td><%=ID%></td>
    4443      </tr>
    4544      <tr>
    46         <td class="prompt">Login</td>
     45        <th>Login</th>
    4746        <td><%=HTML.encodeTags(current.getLogin())%></td>
    4847      </tr>
    4948      <tr>
    50         <td class="prompt">Email</td>
     49        <th>Email</th>
    5150        <td><%=HTML.niceFormat(current.getEmail())%></td>
     51      </tr>
     52      <tr class="dynamic">
     53        <th></th>
     54        <td>
     55          <div class="messagecontainer note">
     56          Produced with the XJSP compiler.
     57          </div>
     58        </td>
    5259      </tr>
    5360      </table>
    5461    </div>
    55     <br>
    56     <table align="center">
    57     <tr>
    58       <td><base:button onclick="window.close()" title="Close" /></td>
    59     </tr>
    60     </table>
    61     </form>
     62
     63    <base:buttongroup subclass="dialogbuttons">
     64      <base:button onclick="window.close()" title="Close" />
     65    </base:buttongroup>
    6266  </base:body>
    6367  </base:page>
  • extensions/net.sf.basedb.examples/trunk/resources/history_file.jsp

    r1391 r1537  
    8787        url += '&item_id='+id;
    8888      }
    89       Main.openPopup(url, 'SelectFile', 1000, 700);
     89      Main.openPopup(url, 'SelectFile', 1050, 700);
    9090    }
    9191    function setFileCallback(id, path)
     
    102102    }
    103103    </script>
    104     <table class="form" cellspacing=0>
     104    <table class="fullform input100">
    105105    <tr>
    106       <td class="prompt">History file</td>
     106      <th>History file</th>
    107107      <td>
    108108        <base:select
     
    116116        />
    117117      </td>
     118      <td></td>
    118119    </tr>
    119     <tr valign=top>
    120       <td class="prompt">Description</td>
    121       <td nowrap>
    122         <textarea class="text" rows="4" cols="40" name="history_description" wrap="virtual"
     120    <tr class="dynamic">
     121      <th>Description</th>
     122      <td>
     123        <textarea class="text" rows="6" name="history_description"
    123124          ><%=HTML.encodeTags(any == null ? "" : any.getDescription())%></textarea>
    124         <a href="javascript:Main.zoom('Description', document.forms[0].name, 'history_description')"
    125           title="Edit in larger window"><base:icon image="zoom.gif" /></a>
     125      </td>
     126      <td style="width: 20px;">
     127        <base:icon image="zoom.png"
     128          onclick="Main.zoom('Description', document.forms[0].name, 'history_description')"
     129          tooltip="Edit in larger window"
     130        />
    126131      </td>
    127132    </tr>
  • extensions/net.sf.basedb.examples/trunk/resources/item_info.jsp

    r1391 r1537  
    7575  <base:head />
    7676  <base:body>
    77     <h3 class="docked">Item information</h3>
    78     <div class="boxedbottom">
     77    <h1>Item information</h1>
     78    <div class="content bottomborder">
    7979     
    80       <table class="form" border="0" cellspacing="1" cellpadding="2">
     80      <table class="fullform larger">
    8181      <tr>
    82         <td class="prompt">Type</td>
     82        <th>Type</th>
    8383        <td><%=itemType.name()%></td>
    8484      </tr>
    8585      <tr>
    86         <td class="prompt">ID</td>
     86        <th>ID</th>
    8787        <td><%=itemId%></td>
    8888      </tr>
    8989      <tr>
    90         <td class="prompt">Name</td>
     90        <th>Name</th>
    9191        <td><%=name == null ? "<i>unknown</i>" : HTML.niceFormat(name)%></td>
    9292      </tr>
    9393      <tr>
    94         <td class="prompt">Registration date</td>
     94        <th>Registration date</th>
    9595        <td><%=registered == null ? "<i>unknown</i>" : dateFormatter.format(registered)%></td>
    9696      </tr>
    9797      <tr>
    98         <td class="prompt">Owned by you?</td>
     98        <th>Owned by you?</th>
    9999        <td><%=isOwnedByYou ? "yes" : "no"%></td>
    100100      </tr>
    101101      <tr>
    102         <td class="prompt">Shared to other users?</td>
     102        <th>Shared to other users?</th>
    103103        <td><%=isShared ? "yes" : "no"%></td>
    104104      </tr>
    105105      <tr>
    106         <td class="prompt">Marked for removal?</td>
     106        <th>Marked for removal?</th>
    107107        <td><%=isRemoved ? "yes" : "no"%></td>
     108      </tr>
     109      <tr class="dynamic">
     110        <th></th>
     111        <td></td>
    108112      </tr>
    109113      </table>
    110114    </div>
    111     <br>
    112     <table align="center">
    113     <tr>
    114       <td><base:button onclick="window.close()" title="Close" /></td>
    115     </tr>
    116     </table>
    117     </form>
     115
     116    <base:buttongroup subclass="dialogbuttons">
     117      <base:button onclick="window.close()" title="Close" />
     118    </base:buttongroup>
    118119  </base:body>
    119120  </base:page>
  • extensions/net.sf.basedb.examples/trunk/resources/scripts/examples.jsp

    r1391 r1537  
    3737    url += '&item_type=' + itemType;
    3838    url += '&item_id='+itemId;
    39     Main.openPopup(url, 'ItemInfo', 400, 300);
     39    Main.openPopup(url, 'ItemInfo', 600, 400);
    4040  }
    4141 
     
    4545    url += '?ID='+getSessionId();
    4646    url += '&item_type=' + itemType;
    47     Main.openPopup(url, 'AnnotationFilter', 400, 300);
     47    Main.openPopup(url, 'AnnotationFilter', 450, 300);
    4848  }
    4949}
Note: See TracChangeset for help on using the changeset viewer.