Ignore:
Timestamp:
06/13/17 13:58:57 (8 years ago)
Author:
Kris Deugau
Message:

/branches/stable

Merge /trunk through r749 for 1.4.0

Location:
branches/stable
Files:
11 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/stable

  • branches/stable/templates/bulkdomain.tmpl

    r649 r756  
    4343<table>
    4444<tr>
    45 <TMPL_LOOP NAME=domtable><td><input type="checkbox" name="<TMPL_IF fwdzone>dom<TMPL_ELSE>rev</TMPL_IF>_<TMPL_VAR NAME=zoneid>" value="<TMPL_VAR NAME=zoneid>" /> <TMPL_VAR NAME=zone></td>
     45<TMPL_LOOP NAME=domtable><td><input type="checkbox" name="<TMPL_IF fwdzone>dom<TMPL_ELSE>rev</TMPL_IF>_<TMPL_VAR NAME=zoneid>" value="<TMPL_VAR NAME=zoneid>" /> <TMPL_VAR NAME=zone><TMPL_IF location> (<TMPL_VAR NAME=location>)</TMPL_IF></td>
    4646<TMPL_IF newrow><TMPL_UNLESS __last__></tr>
    4747<tr>

  • branches/stable/templates/dns.css

    r649 r756  
    3636        background-color: #F0F0F0;
    3737}
     38
     39/* Alternating row colours, now in CSS */
     40.altrows > tbody > tr {
     41        background-color: #D0E0E0;
     42}
     43.altrows > tbody > tr:nth-child(even) {
     44        background-color: #FFFFFF;
     45}
     46.altrows > tbody > tr:nth-child(odd) {
     47        background-color: #DDDDDD;
     48}
     49
    3850.container {
    3951        background-color: #FFFFFF;
    … …  
    188200.center {
    189201        text-align: center;
     202}
     203.vpad {
     204        padding-top: 5px;
     205        padding-bottom: 5px;
    190206}
    191207/* not sure this really does what I think it does.  is it really not
    … …  
    277293        font-size: 1.2em;
    278294}
     295
     296/* Pure CSS "click to show" widget, adapted from the group tree CSS */
     297.collapsible li > input + * {
     298        display: none;
     299}
     300/* when the input is checked, show the content div */
     301.collapsible li > input:checked + * {
     302        display: block;
     303}
     304/* hide the checkbox */
     305.nocheckbox li > input {
     306        display: none;
     307        margin: 0em;
     308        padding: 0px;
     309}
     310/* mostly just making the input label clickable */
     311.collapsible label {
     312        cursor: pointer;
     313        display: inline;
     314        margin: 0em;
     315        padding: 0px;
     316        padding-left: 10px;
     317}
     318/* be nice if we could make this work without the HTML list structure... */
     319.notalist {
     320        list-style: none;
     321        margin: 0;
     322        padding: 1px;
     323}
     324

  • branches/stable/templates/domlist.tmpl

    r725 r756  
    2828</table>
    2929
    30 <table width="98%" border="0" cellspacing="4" cellpadding="3">
     30<table width="98%" border="0" cellspacing="4" cellpadding="3" class="altrows">
    3131<tr>
    3232<TMPL_LOOP NAME=colheads>       <td class="datahead_<TMPL_IF __first__>l<TMPL_ELSE>s</TMPL_IF>"><a href="<TMPL_VAR
    … …  
    4141<TMPL_IF name=domtable>
    4242<TMPL_LOOP name=domtable>
    43 <tr class="row<TMPL_IF __odd__>0<TMPL_ELSE>1</TMPL_IF>">
     43<tr>
    4444        <td align="left"><a href="<TMPL_VAR NAME=script_self>&amp;page=reclist&amp;id=<TMPL_VAR NAME=zoneid>&amp;defrec=n<TMPL_UNLESS domlist>&amp;revrec=y</TMPL_UNLESS>"><TMPL_VAR NAME=zone></a><TMPL_IF location> (<TMPL_VAR NAME=location>)</TMPL_IF></td>
    4545        <td><TMPL_IF status>Active<TMPL_ELSE>Inactive</TMPL_IF></td>
    … …  
    4949</tr>
    5050</TMPL_LOOP>
    51 <tr><td colspan="5" align="center"><TMPL_INCLUDE NAME="fpnla.tmpl"></td></tr>
    5251<TMPL_ELSE>
    5352<tr><td colspan="5" align="center">No <TMPL_IF domlist>domains<TMPL_ELSE>reverse zones</TMPL_IF> found</td></tr>
    … …  
    5554</table>
    5655
     56<TMPL_IF domtable><div class="center vpad"><TMPL_INCLUDE NAME="fpnla.tmpl"></div></TMPL_IF>
     57
    5758</td>
    5859</tr>

  • branches/stable/templates/footer.tmpl

    r548 r756  
    55<div id="contact">
    66<a href="https://secure.deepnet.cx/trac/dnsadmin">dnsadmin</a> <TMPL_VAR NAME=version>
    7 &copy; 2008-2013 <a href="mailto:kdeugau@deepnet.cx">Kris Deugau</a>/<a href="http://www.deepnet.cx">deepnet</a><br />
     7&copy; 2008-2016 <a href="mailto:kdeugau@deepnet.cx">Kris Deugau</a>/<a href="http://www.deepnet.cx">deepnet</a><br />
    88Written for standards-based browsers (eg <a href="http://www.firefox.com">FireFox</a>/<a href="http://www.mozilla.org">Mozilla</a>)
    99</div>

  • branches/stable/templates/grpman.tmpl

    r649 r756  
    2424</table>
    2525
    26 <table width="98%" border="0" cellspacing="4" cellpadding="3">
     26<table width="98%" border="0" cellspacing="4" cellpadding="3" class="altrows">
    2727<tr>
    2828<TMPL_LOOP NAME=colheads>       <td class="datahead_<TMPL_IF __first__>l<TMPL_ELSE>s</TMPL_IF>"><a href="<TMPL_VAR
    … …  
    3838<TMPL_IF name=grouptable>
    3939<TMPL_LOOP name=grouptable>
    40 <tr class="row<TMPL_IF __odd__>0<TMPL_ELSE>1</TMPL_IF>">
     40<tr>
    4141        <td align="left"><TMPL_IF edgrp><a href="<TMPL_VAR NAME=script_self>&amp;page=edgroup&amp;gid=<TMPL_VAR NAME=groupid>"><TMPL_VAR NAME=groupname></a><TMPL_ELSE><TMPL_VAR NAME=groupname></TMPL_IF></td>
    4242        <td><TMPL_VAR name=pgroup></td>
    … …  
    4949</tr>
    5050</TMPL_LOOP>
    51 <tr><td colspan="6" align="center"><TMPL_INCLUDE NAME="fpnla.tmpl"></td></tr>
    5251<TMPL_ELSE>
    5352<tr><td colspan="6" align="center">No groups found</td></tr>
    … …  
    5554</table>
    5655
     56<TMPL_IF grouptable><div class="center vpad"><TMPL_INCLUDE NAME="fpnla.tmpl"></div></TMPL_IF>
     57
    5758</td>
    5859</tr>

  • branches/stable/templates/loclist.tmpl

    r649 r756  
    2121</table>
    2222
    23 <table width="98%" border="0" cellspacing="4" cellpadding="3" class="csubtable">
     23<table width="98%" border="0" cellspacing="4" cellpadding="3" class="csubtable altrows">
    2424<tr>
    2525<TMPL_LOOP NAME=colheads>       <td class="datahead_s"><a href="<TMPL_VAR
    … …  
    3333<TMPL_IF name=loctable>
    3434<TMPL_LOOP name=loctable>
    35 <tr class="row<TMPL_IF __odd__>0<TMPL_ELSE>1</TMPL_IF>">
     35<tr>
    3636        <td align="left"><TMPL_IF edloc><a href="<TMPL_VAR NAME=script_self>&amp;page=location&amp;locact=edit&amp;loc=<TMPL_VAR NAME=location>"><TMPL_VAR NAME=description></a><TMPL_ELSE><TMPL_VAR NAME=description></TMPL_IF></td>
    3737        <td><TMPL_VAR name=iplist></td>
    … …  
    4848</table>
    4949
     50<TMPL_IF loctable><div class="center vpad"><TMPL_INCLUDE NAME="fpnla.tmpl"></div></TMPL_IF>
     51
    5052</td>
    5153</tr>

  • branches/stable/templates/log.tmpl

    r649 r756  
    88
    99<TMPL_IF errmsg>
    10 <div class='errmsg'><TMPL_VAR NAME=errmsg></div>
     10<div class="errmsg"><TMPL_VAR NAME=errmsg></div>
    1111</TMPL_IF>
    1212
    13 <table border="0" width="90%">
     13<table border="0" width="98%">
    1414<tr><th colspan="3"><div class="center maintitle">Log entries for <TMPL_VAR NAME=logfor></div></th></tr>
    1515<tr>
    1616<td class="leftthird"><TMPL_INCLUDE NAME="pgcount.tmpl"></td>
    1717<td align="center"><TMPL_INCLUDE NAME="fpnla.tmpl"></td>
    18 <td class="rightthird">&nbsp;</td>
     18<td class="rightthird">
     19        <form action="<TMPL_VAR NAME=script_self>">
     20        <input type="hidden" name="page" value="log" />
     21        <input type="hidden" name="offset" value="0" />
     22        <input type="hidden" name="id" value="<TMPL_VAR NAME=id>" />
     23        <input type="hidden" name="ltype" value="<TMPL_VAR NAME=ltype>" />
     24        <input name="logfilter"<TMPL_IF logfilter> value="<TMPL_VAR NAME=logfilter ESCAPE=HTML>"</TMPL_IF> />
     25        <input type="submit" value="Filter" />
     26        </form>
     27</td>
    1928</tr>
    2029</table>
    21 <table border="0" width="90%">
    22       <!-- Not sure "Customer ID" (filled with uid) is of any use... -->
    23       <!-- td>Customer ID</td -->
     30<table border="0" width="98%">
    2431<tr class="darkrowheader">
    25 <TMPL_LOOP NAME=colheads>       <td><a href="<TMPL_VAR NAME=script_self>&amp;page=<TMPL_VAR NAME=page><TMPL_IF
     32<TMPL_LOOP NAME=colheads>
     33        <td class="data_nowrap"><a href="<TMPL_VAR NAME=script_self>&amp;page=<TMPL_VAR NAME=page><TMPL_IF
    2634 NAME=offset>&amp;offset=<TMPL_VAR NAME=offset></TMPL_IF>&amp;sortby=<TMPL_VAR
    2735 NAME=sortby>&amp;order=<TMPL_VAR NAME=order>&amp;id=<TMPL_VAR NAME=id>&amp;ltype=<TMPL_VAR
    … …  
    3543<TMPL_LOOP NAME=logentries>
    3644    <tr class="datalinelight">
    37         <td><TMPL_VAR NAME=userfname></td>
    38         <!-- td><TMPL_VAR NAME=userid></td -->
    39         <td><TMPL_VAR NAME=useremail></td>
    40         <td><TMPL_VAR NAME=logentry></td>
     45        <td><a href="<TMPL_VAR NAME=script_self>&amp;page=log&amp;sortby=<TMPL_VAR
     46 NAME=sortby>&amp;order=<TMPL_VAR NAME=order>&amp;<TMPL_IF userid>id=<TMPL_VAR
     47 NAME=userid><TMPL_ELSE>fname=<TMPL_VAR NAME=userfname ESCAPE=URL></TMPL_IF>&amp;ltype=user"><TMPL_VAR
     48 NAME=userfname></a></td>
     49        <td><a href="<TMPL_VAR NAME=script_self>&amp;page=log&amp;sortby=<TMPL_VAR
     50 NAME=sortby>&amp;order=<TMPL_VAR NAME=order>&amp;id=<TMPL_VAR
     51 NAME=domain_id>&amp;ltype=dom"><TMPL_VAR NAME=domain></a></td>
     52        <td><a href="<TMPL_VAR NAME=script_self>&amp;page=log&amp;sortby=<TMPL_VAR
     53 NAME=sortby>&amp;order=<TMPL_VAR NAME=order>&amp;id=<TMPL_VAR
     54 NAME=rdns_id>&amp;ltype=rdns"><TMPL_VAR NAME=revzone></a></td>
     55<TMPL_IF childentries>
     56        <td>
     57  <ul class="collapsible nocheckbox notalist">
     58    <li class="notalist">
     59      <label for="childlist<TMPL_VAR NAME=logparent>"><TMPL_VAR NAME=logentry>&nbsp;(<img src="<TMPL_VAR
     60 NAME=webpath>/images/tree_open.png" />Click for details)</label>
     61      <input type="checkbox" id="childlist<TMPL_VAR NAME=logparent>" />
     62      <ul class="notalist">
     63        <li class="notalist"><TMPL_LOOP NAME=childentries>
     64          <TMPL_VAR NAME=entry><TMPL_UNLESS __last__><br /></TMPL_UNLESS></TMPL_LOOP>
     65        </li>
     66      </ul>
     67    </li>
     68  </ul>
     69<TMPL_ELSE>
     70        <td><TMPL_VAR NAME=logentry>
     71</TMPL_IF>
     72</td>
    4173        <td><TMPL_VAR NAME=logtime></td>
    4274    </tr>
    4375</TMPL_LOOP>
    44     <tr><td colspan="5" align="center"><TMPL_INCLUDE NAME="fpnla.tmpl"></td></tr>
    4576<TMPL_ELSE>
    4677    <tr class="datalinelight">
    … …  
    5081</table>
    5182
     83<TMPL_IF logentries><div class="center vpad"><TMPL_INCLUDE NAME="fpnla.tmpl"></div></TMPL_IF>
     84
    5285</td>
    5386</tr>

  • branches/stable/templates/menu.tmpl

    r649 r756  
    3131<!-- hmm:  <TMPL_VAR NAME=groupname> -->
    3232<hr />
     33Find records(s):
     34<form action="<TMPL_VAR NAME=script_self>&amp;page=recsearch" method="post">
     35<input name="searchfor" />
     36<input type="submit" value=" Search " />
     37</form>
     38<hr />
    3339<a href="<TMPL_VAR NAME=script_self>&amp;page=dnsq">DNS Query</a><br />
    3440<a href="<TMPL_VAR NAME=script_self>&amp;page=whoisq">WHOIS Query</a><br />

  • branches/stable/templates/reclist.tmpl

    r649 r756  
    4949</table>
    5050
    51 <table width="100%">
     51<table width="100%" class="altrows">
    5252<TMPL_IF reclist>
    5353<tr class="darkrowheader">
    … …  
    6262</tr>
    6363<TMPL_LOOP NAME=reclist>
    64 <tr class="row<TMPL_IF __odd__>0<TMPL_ELSE>1</TMPL_IF>">
     64<tr>
    6565<TMPL_IF fwdzone>
    6666        <td><TMPL_IF record_edit><a href="<TMPL_VAR NAME=script_self>&amp;page=record&amp;parentid=<TMPL_VAR
    … …  
    8989</tr>
    9090</TMPL_LOOP>
    91 <tr class="darkrowheader"><td colspan="8" align="center"><TMPL_INCLUDE NAME="fpnla.tmpl"></td></tr>
    9291<TMPL_ELSE>
    9392<tr><td colspan="8" align="center">No records found</td></tr>
    9493</TMPL_IF>
    9594</table>
     95
     96<TMPL_IF reclist><div class="center vpad"><TMPL_INCLUDE NAME="fpnla.tmpl"></div></TMPL_IF>
    9697
    9798</td></tr></table>

  • branches/stable/templates/useradmin.tmpl

    r649 r756  
    2222</table>
    2323
    24 <table width="98%" border="0" cellspacing="4" cellpadding="3" class="csubtable">
     24<table width="98%" border="0" cellspacing="4" cellpadding="3" class="csubtable altrows">
    2525<tr>
    2626<TMPL_LOOP NAME=colheads>       <td class="datahead_<TMPL_IF __first__>l<TMPL_ELSE>s</TMPL_IF>"><a href="<TMPL_VAR
    … …  
    3434<TMPL_IF name=usertable>
    3535<TMPL_LOOP name=usertable>
    36 <tr class="row<TMPL_IF __odd__>0<TMPL_ELSE>1</TMPL_IF>">
     36<tr>
    3737        <td align="left"><TMPL_IF eduser><a href="<TMPL_VAR NAME=script_self>&amp;page=user&amp;useraction=edit&amp;user=<TMPL_VAR NAME=user_id>"><TMPL_VAR NAME=username></a><TMPL_ELSE><TMPL_VAR NAME=username></TMPL_IF></td>
    3838        <td class="data_nowrap"><TMPL_VAR name=fname></td>
    … …  
    5151</tr>
    5252</TMPL_LOOP>
    53 <tr><td colspan="6" align="center"><TMPL_INCLUDE NAME="fpnla.tmpl"></td></tr>
    5453<TMPL_ELSE>
    5554<tr><td colspan="6" align="center">No users found</td></tr>
    … …  
    5756</table>
    5857
     58<TMPL_IF usertable><div class="center vpad"><TMPL_INCLUDE NAME="fpnla.tmpl"></div></TMPL_IF>
     59
    5960</td>
    6061</tr>
Note: See TracChangeset for help on using the changeset viewer.