Changeset 39


Ignore:
Timestamp:
12/01/09 17:21:41 (14 years ago)
Author:
Kris Deugau
Message:

/trunk

XHTML strict, pass 2
fixed up a collection of things found to be broken (mostly relating to hardcoded group bits)
added a collection of notes-to-self to notes

Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/dns.cgi

    r38 r39  
    344344  $page->param(id => $webvar{id});
    345345  $page->param(defrec => $webvar{defrec});
     346  $page->param(parentid => $webvar{parentid});
    346347  # first pass = confirm y/n (sorta)
    347348  if (!defined($webvar{del})) {
    … …  
    351352    $page->param(ftype => $typemap{$rec{type}});
    352353    $page->param(recval => $rec{val});
    353   } else {
     354  } elsif ($webvar{del} eq 'ok') {
    354355    my ($code,$msg) = delRec($dbh,$webvar{defrec},$webvar{id});
    355356    if ($code ne 'OK') {
    … …  
    357358      $page->param(del_failed => 1);
    358359      $page->param(errmsg => $msg);
    359     }
    360 ##fixme:  group/parent instead of hardcoded 1
    361     showdomain('y',1);
     360      showdomain($webvar{defrec}, $webvar{parentid});
     361    } else {
     362      changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec});
     363    }
     364  } else {
     365    changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec});
    362366  }
    363367
    364368} elsif ($webvar{page} eq 'editsoa') {
    365369
    366   fillsoa($webvar{defrec},$webvar{recid});
     370  fillsoa($webvar{defrec},$webvar{id});
    367371
    368372} elsif ($webvar{page} eq 'updatesoa') {
    369   print "ooooo!\n";
    370373
    371374  my $sth;
    … …  
    373376  # no domain ID, so we're editing the default SOA for a group (we don't care which one here)
    374377  # plus a bit of magic to update the appropriate table
    375   $sql = "update ".($webvar{domainid} eq '' ? "default_records" : "records").
     378  $sql = "update ".($webvar{defrec} eq 'y' ? "default_records" : "records").
    376379        " set host='$webvar{prins}:$webvar{contact}',".
    377380        " val='$webvar{refresh}:$webvar{retry}:$webvar{expire}:$webvar{minttl}',".
    … …  
    383386    $page->param(update_failed => 1);
    384387    $page->param(msg => $DBI::errstr);
    385     fillsoa($webvar{defrec},1);
    386   } else {
     388    fillsoa($webvar{defrec},$webvar{id});
     389  } else {
     390    changepage(page => "reclist", id => $webvar{id}, defrec => $webvar{defrec});
    387391    $page->param(update_failed => 0);
    388392##fixme!  need to set group ID properly here
    389     showdomain('y',1);
     393#    showdomain('y',1);
    390394  }
    391395
    … …  
    657661  my $tmp_ruri = $ENV{REQUEST_URI};
    658662  $tmp_ruri =~ s/\&([a-z])/\&amp\;$1/g;
     663# le sigh.  and we need to strip any previous action
     664  $tmp_ruri =~ s/\&action=[^&]+//g;
    659665#  $page->param(whereami => $ENV{REQUEST_URI});
    660666  $page->param(whereami => $tmp_ruri);
    … …  
    733739  my $def = shift;
    734740  my $id = shift;
    735   my $domname;
    736 
    737   if ($webvar{domain} == 0) {
    738     $domname = "DOMAIN";
    739   } else {
    740     my $sth = $dbh->prepare("SELECT domain FROM domains WHERE domain_id=?");
    741     $sth->execute($webvar{domain});
    742     ($domname) = $sth->fetchrow_array();
    743   }
    744 
    745   $page->param(domain   => $domname);
    746   $page->param(defrec   => !$webvar{domain});
    747   $page->param(group    => $DNSDB::group);
     741  my $domname = ($def eq 'y' ? '' : "DOMAIN");
     742
     743  $page->param(defrec   => $def);
     744
     745# i had a good reason to do this when I wrote it...
     746#  $page->param(domain  => $domname);
     747#  $page->param(group   => $DNSDB::group);
     748  $page->param(isgrp => 1) if $def eq 'y';
     749  $page->param(parent => ($def eq 'y' ? groupName($dbh, $DNSDB::group) : domainName($dbh, $id)) );
    748750
    749751# defaults
    … …  
    759761  my %soa = getSOA($dbh,$def,$id);
    760762
    761   $page->param(domainid => $webvar{domain});
     763  $page->param(id       => $id);
    762764  $page->param(recid    => $soa{recid});
    763765  $page->param(prins    => ($soa{prins} ? $soa{prins} : $DNSDB::def{prins}));

  • trunk/notes

    r2 r39  
    224224update_nameservers()
    225225
     226
     227FFFF:FFFF:FFFF:FFFF : FFFF:FFFF:FFFF:FFFF
     228we get:
     229  <x>:<x>:FFFF:FFFF
     230we assign:
     231  <x>:<x>:<y>:<a>       (/64, nominally equivalent to current /32, logically)
     232  <x>:<x>:<y>:<b>FF     (/56, bitwise equivalent to current /24 relative to /32)
     233  <x>:<x>:<y>:FFFF      (/48, bitwise equivalent to current /16 relative to /24)
     234 
     235Allocations SHOULD leave space for growth
     236
     237
     238SELECT u.user_id, u.email, u.firstname, u.lastname, u.type, g.group_name
     239        "FROM users u ".
     240        "INNER JOIN groups g ON u.group_id=g.group_id ".
     241        ($offset eq 'all' ? '' : " LIMIT $perpage OFFSET ".$offset*$perpage)
     242
     243
     244SELECT g.group_id, g.group_name, g2.group_name, g.children, count(distinct(u.email)), count(distinct(d.domain))
     245FROM groups g
     246INNER JOIN groups g2 ON g2.group_id=g.parent_group_id
     247LEFT OUTER JOIN users u ON u.group_id=g.group_id
     248LEFT OUTER JOIN domains d ON d.group_id=g.group_id
     249GROUP BY g.group_id, g.group_name, g2.group_name, g.children
     250
     251
     252
     253 record_id | group_id |                  host                  | type |           val           | distance | weight | port |  ttl  | description
     254-----------+----------+----------------------------------------+------+-------------------------+----------+--------+------+-------+-------------
     255         1 |        1 | ns1.example.com:hostmaster.DOMAIN      |    6 | 10800:3600:604800:10800 |        0 |      0 |    0 | 86400 |
     256        25 |        1 | DOMAIN                                 |    1 | 10.2.3.4                |        0 |      0 |    0 |  7200 |
     257         2 |        1 | DOMAIN                                 |   15 | mx1.example.com         |       10 |      0 |    0 |  7200 |
     258        26 |        1 | DOMAIN                                 |   15 | mx2.example.com         |       10 |      0 |    0 |  7200 |
     259        27 |        1 | DOMAIN                                 |    2 | ns2.example.com         |        0 |      0 |    0 |  7200 |
     260        22 |        1 | DOMAIN                                 |    2 | ns1.example.com         |        0 |      0 |    0 |  7200 |
     261        31 |        1 | www.DOMAIN                             |    5 | DOMAIN                  |        0 |      0 |    0 | 10800 |
     262        32 |        1 | DOMAIN                                 |   16 | "v=spf1 a mx -all"      |        0 |      0 |    0 | 10800 |
     263        17 |        1 | DOMAIN                                 |   33 | srv.example.com         |       15 |      2 |  325 |  7200 |
     264
     265
     266serial in domains table
     267'manual' - date+inc
     268'manual' - monotone
     269'auto' - generated (TinyDNS only;  uses auto(date) for other exports)
     270
     271
     272log_id?  domain_id?  group_id  user_id  action  detail timestamp

  • trunk/templates/deldom.tmpl

    r38 r39  
    99
    1010<TMPL_ELSE>
    11  <!-- <TMPL_IF del_failed>
    12   <div class='errmsg'>Error deleting domain <TMPL_VAR NAME=domain>: <TMPL_VAR NAME=errmsg></div>
    13  </TMPL_IF> -->
    14  <TMPL_INCLUDE NAME="domlist.tmpl">
     11<TMPL_INCLUDE NAME="domlist.tmpl">
    1512</TMPL_IF>

  • trunk/templates/delgrp.tmpl

    r38 r39  
    1010
    1111<TMPL_ELSE>
    12  <!-- <TMPL_IF del_failed>
    13   <div class='errmsg'>Error deleting group <TMPL_VAR NAME=delgroupname>: <TMPL_VAR NAME=errmsg></div>
    14  </TMPL_IF> -->
    15  <TMPL_INCLUDE NAME="grpman.tmpl">
     12<TMPL_INCLUDE NAME="grpman.tmpl">
    1613</TMPL_IF>

  • trunk/templates/delrec.tmpl

    r38 r39  
    66<h3>Are you really sure you want to delete record:<br />
    77<TMPL_VAR NAME=host> <TMPL_VAR NAME=ftype> <TMPL_VAR NAME=recval></h3>
    8 <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delrec&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>">cancel</a> &nbsp; | &nbsp; <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delrec&amp;del=ok&amp;id=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>">confirm</a>
     8<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delrec&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;parentid=<TMPL_VAR NAME=parentid>">cancel</a> &nbsp; | &nbsp; <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delrec&amp;del=ok&amp;id=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;parentid=<TMPL_VAR NAME=parentid>">confirm</a>
    99</td></tr></table>
    1010
    1111<TMPL_ELSE>
    12 <TMPL_IF del_failed>
    13 <!-- Need to find failure mode to cause/test this -->
    14 <h1>FOO!</h1>
    15 <TMPL_VAR NAME=errmsg>
    16 <TMPL_ELSE>
    1712<TMPL_INCLUDE NAME="reclist.tmpl">
    1813</TMPL_IF>
    19 </TMPL_IF>

  • trunk/templates/deluser.tmpl

    r38 r39  
    99
    1010<TMPL_ELSE>
    11  <!-- <TMPL_IF del_failed>
    12   <div class='errmsg'>Error deleting user <TMPL_VAR NAME=domain>: <TMPL_VAR NAME=errmsg></div>
    13  </TMPL_IF> -->
    14  <TMPL_INCLUDE NAME="useradmin.tmpl">
     11<TMPL_INCLUDE NAME="useradmin.tmpl">
    1512</TMPL_IF>

  • trunk/templates/dns.css

    r38 r39  
    1111        margin-right: 0px;
    1212/*      background-color: #deadDD;*/
    13 /*      background-color: #FFFF00;*/
     13        background-color: #f8f8f8;
    1414}
    1515hr {
    … …  
    6868        text-align: right;
    6969        padding: 3px;
     70}
     71td.datahead_l {
     72        background-color: #F0F0F0;
     73        border-bottom: 1px solid #666666;
     74        text-align: left;
     75}
     76td.datahead_s {
     77        background-color: #F0F0F0;
     78        border-bottom: 1px solid #666666;
     79        width: 1%;
     80        white-space: nowrap;
    7081}
    7182td.data {
    … …  
    133144        right: 3px;
    134145}
     146.center {
     147        text-align: center;
     148}
    135149
    136 /* Specific common divs */
    137150#header {
    138151        border-bottom: thin solid #000000;
    … …  
    173186        padding: 3px;
    174187}
     188#soadetail {
     189        text-align: left;
     190}
     191/* somewhat generic/reusable */
     192#borderme {
     193        border: thin solid #666666;
     194        width: 98%;
     195        float:left;
     196        clear:left;
     197}

  • trunk/templates/domlist.tmpl

    r38 r39  
    99 </TMPL_IF>
    1010
     11<div id="borderme">
     12
    1113<table width="98%">
    12 <tr><td colspan="3" align="center">Domain list</td></tr>
    13 <tr><td><TMPL_INCLUDE NAME="pgcount.tmpl"></td>
    14 <td>
     14<tr><th colspan="3" align="center">Domain list</th></tr>
     15<tr><td align="left"><TMPL_INCLUDE NAME="pgcount.tmpl"></td>
     16<td align="center">
    1517<TMPL_INCLUDE NAME="fpnla.tmpl">
    1618</td><td align="right">insert search box here</td></tr>
    … …  
    2123</table>
    2224
    23 <table border="0" cellspacing="5" cellpadding="3">
     25<table width="98%" border="0" cellspacing="4" cellpadding="3">
    2426<tr>
    2527<TMPL_IF NAME=foobarbaz>
    2628<!-- This block to be un-TMPL_IF'ed once we care about sort order - by default, we sort by domain, ascending -->
    27         <td><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=domlist&amp;offset=<TMPL_VAR NAME=offset>">Domain<TMPL_IF NAME=sortdomain>&nbsp;<img border="0" alt='<TMPL_VAR NAME=sortorder>' src="images/<TMPL_VAR NAME=sortorder>.png" /></TMPL_IF></a></td>
    28         <td><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=domlist&amp;offset=<TMPL_VAR NAME=offset>">Status<TMPL_IF NAME=sortstatus>&nbsp;<img border="0" alt='<TMPL_VAR NAME=sortorder>' src="images/<TMPL_VAR NAME=sortorder>.png" /></TMPL_IF></a></td>
    29         <td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=domlist&amp;offset=<TMPL_VAR NAME=offset>">Group<TMPL_IF NAME=sortgroup>&nbsp;<img border="0" alt='<TMPL_VAR NAME=sortorder>' src="images/<TMPL_VAR NAME=sortorder>.png" /></TMPL_IF></a></td>
     29        <th><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=domlist&amp;offset=<TMPL_VAR NAME=offset>">Domain<TMPL_IF NAME=sortdomain>&nbsp;<img border="0" alt='<TMPL_VAR NAME=sortorder>' src="images/<TMPL_VAR NAME=sortorder>.png" /></TMPL_IF></a></td>
     30        <th><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=domlist&amp;offset=<TMPL_VAR NAME=offset>">Status<TMPL_IF NAME=sortstatus>&nbsp;<img border="0" alt='<TMPL_VAR NAME=sortorder>' src="images/<TMPL_VAR NAME=sortorder>.png" /></TMPL_IF></a></td>
     31        <th align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=domlist&amp;offset=<TMPL_VAR NAME=offset>">Group<TMPL_IF NAME=sortgroup>&nbsp;<img border="0" alt='<TMPL_VAR NAME=sortorder>' src="images/<TMPL_VAR NAME=sortorder>.png" /></TMPL_IF></a></td>
    3032<TMPL_ELSE>
    31         <td>Domain</td>
    32         <td>Status</td>
    33         <td align="center">Group</td>
     33        <td class="datahead_l">Domain</td>
     34        <td class="datahead_s">Status</td>
     35        <td class="datahead_s">Group</td>
    3436</TMPL_IF>
    35         <td align="center">Change Status</td>
    36         <td>Delete</td>
     37        <td class="datahead_s">Change Status</td>
     38        <td class="datahead_s">Delete</td>
    3739</tr>
    3840<TMPL_IF name=domtable>
    3941<TMPL_LOOP name=domtable>
    4042<tr class="row<TMPL_VAR name=bg>">
    41         <td><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=reclist&amp;id=<TMPL_VAR NAME=domainid>&amp;defrec=n"><TMPL_VAR NAME=domain></a></td>
     43        <td align="left"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=reclist&amp;id=<TMPL_VAR NAME=domainid>&amp;defrec=n"><TMPL_VAR NAME=domain></a></td>
    4244        <td><TMPL_VAR name=status></td>
    4345        <td><TMPL_VAR name=group></td>
    … …  
    5153</table>
    5254
     55</div>
     56
    5357</td>
    5458</tr>

  • trunk/templates/editsoa.tmpl

    r38 r39  
    44
    55<td align="center">
     6
    67<TMPL_IF update_failed><div class="errmsg">Error updating SOA record: <TMPL_VAR NAME=msg></div></TMPL_IF>
     8
    79<div>edit SOA</div>
     10
    811<div id="tableholder">
    9 <table border=0 cellspacing=2 cellpadding=1 width="100%">
     12
     13<form action="dns.cgi" method="post">
     14<fieldset>
     15<input type="hidden" name="sid" value="<TMPL_VAR NAME=sid>" />
     16<input type="hidden" name="page" value="updatesoa" />
     17<input type="hidden" name="id" value="<TMPL_VAR NAME=id>" />
     18<input type="hidden" name="recid" value="<TMPL_VAR NAME=recid>" />
     19<input type="hidden" name="defrec" value="<TMPL_VAR NAME=defrec>" />
     20
     21<table border="0" cellspacing="2" cellpadding="1" width="100%">
    1022<tr class="darkrowheader">
    11         <td colspan=2 class="title"><TMPL_IF NAME=defrec>Edit default SOA record for group <TMPL_VAR NAME=group><TMPL_ELSE>Edit SOA record for <TMPL_VAR NAME=domain></TMPL_IF></td>
     23        <td colspan="2" class="title"><TMPL_IF NAME=isgrp>Edit default SOA record for group <TMPL_ELSE>Edit SOA record for </TMPL_IF><TMPL_VAR NAME=parent></td>
    1224        <td class="title">Systemwide defaults:</td>
    1325</tr>
    14 
    15 <form action="dns.cgi" method=POST>
    16 <input type="hidden" name="sid" value="<TMPL_VAR NAME=sid>">
    17 <input type="hidden" name="recid" value="<TMPL_VAR NAME=recid>">
    18 <input type="hidden" name="page" value="updatesoa">
    19 <input type="hidden" name="domainid" value="<TMPL_VAR NAME=domainid>">
    20 
    2126<tr class="datalinelight">
    2227        <td class="inputlabel">Primary Name Server</td>
    23         <td><input name=prins value="<TMPL_VAR NAME=prins>"></td>
     28        <td><input name="prins" value="<TMPL_VAR NAME=prins>" /></td>
    2429        <td class="data"><TMPL_VAR NAME=defns></td>
    2530</tr>
    2631<tr class="datalinelight">
    2732        <td class="inputlabel">Contact Address</td>
    28         <td><input name=contact value="<TMPL_VAR NAME=contact>"></td>
     33        <td><input name="contact" value="<TMPL_VAR NAME=contact>" /></td>
    2934        <td class="data"><TMPL_VAR NAME=defcontact></td>
    3035</tr>
    3136<tr class="datalinelight">
    3237        <td class="inputlabel">SOA TTL</td>
    33         <td><input name=ttl value="<TMPL_VAR NAME=ttl>"></td>
     38        <td><input name="ttl" value="<TMPL_VAR NAME=ttl>" /></td>
    3439        <td class="data"><TMPL_VAR NAME=defsoattl></td>
    3540</tr>
    3641<tr class="datalinelight">
    3742        <td class="inputlabel">Refresh</td>
    38         <td><input name=refresh value="<TMPL_VAR NAME=refresh>"></td>
     43        <td><input name="refresh" value="<TMPL_VAR NAME=refresh>" /></td>
    3944        <td class="data"><TMPL_VAR NAME=defrefresh></td>
    4045</tr>
    4146<tr class="datalinelight">
    4247        <td class="inputlabel">Retry</td>
    43         <td><input name=retry value="<TMPL_VAR NAME=retry>"></td>
     48        <td><input name="retry" value="<TMPL_VAR NAME=retry>" /></td>
    4449        <td class="data"><TMPL_VAR NAME=defretry></td>
    4550</tr>
    4651<tr class="datalinelight">
    4752        <td class="inputlabel">Expire</td>
    48         <td><input name=expire value="<TMPL_VAR NAME=expire>"></td>
     53        <td><input name="expire" value="<TMPL_VAR NAME=expire>" /></td>
    4954        <td class="data"><TMPL_VAR NAME=defexpire></td>
    5055</tr>
    5156<tr class="datalinelight">
    5257        <td class="inputlabel">Minimum TTL</td>
    53         <td><input name=minttl value="<TMPL_VAR NAME=minttl>"></td>
     58        <td><input name="minttl" value="<TMPL_VAR NAME=minttl>" /></td>
    5459        <td class="data"><TMPL_VAR NAME=defminttl></td>
    5560</tr>
    5661<tr class="datalinelight">
    57         <td colspan=3 align=center><input type=submit value=" Update record "></td>
     62        <td colspan="3" align="center"><input type="submit" value=" Update record " /></td>
    5863</tr>
    5964</table>
    6065
     66</fieldset>
    6167</form>
    6268
    6369</div>
    6470
    65 </td></tr>
     71</td>
     72</tr>
    6673</table>   
    6774
    68 <hr /><hr />
    69 
    70 

  • trunk/templates/fpnla.tmpl

    r38 r39  
    11<TMPL_IF navfirst><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=<TMPL_VAR NAME=curpage>&amp;offset=0<TMPL_IF id>&amp;id=<TMPL_VAR NAME=id></TMPL_IF><TMPL_IF defrec>&amp;defrec=<TMPL_VAR NAME=defrec></TMPL_IF>"><img src="images/frev.png" alt="[ First ]" />first</a><TMPL_ELSE><img src="images/frev.png" alt="[ First ]" />first</TMPL_IF>&nbsp;
    22<TMPL_IF navprev><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=<TMPL_VAR NAME=curpage>&amp;offset=<TMPL_VAR NAME=prevoffs><TMPL_IF id>&amp;id=<TMPL_VAR NAME=id></TMPL_IF><TMPL_IF defrec>&defrec=<TMPL_VAR NAME=defrec></TMPL_IF>"><img src="images/rev.png" alt="[ Previous ]" />previous</a><TMPL_ELSE><img src="images/rev.png" alt="[ Previous ]" />previous</TMPL_IF>&nbsp;
    3 <TMPL_IF navnext><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=<TMPL_VAR NAME=curpage>&amp;offset=<TMPL_VAR NAME=nextoffs><TMPL_IF id>&amp;id=<TMPL_VAR NAME=id></TMPL_IF><TMPL_IF defrec>&defrec=<TMPL_VAR NAME=defrec></TMPL_IF>">next<img src="images/fwd.png" alt="[ Next ]" /></a><TMPL_ELSE>next<img src="images/fwd.png" alt="[ Next ]" /></TMPL_IF>&nbsp;
     3<TMPL_IF navnext><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=<TMPL_VAR NAME=curpage>&amp;offset=<TMPL_VAR NAME=nextoffs><TMPL_IF id>&amp;id=<TMPL_VAR NAME=id></TMPL_IF><TMPL_IF defrec>&amp;defrec=<TMPL_VAR NAME=defrec></TMPL_IF>">next<img src="images/fwd.png" alt="[ Next ]" /></a><TMPL_ELSE>next<img src="images/fwd.png" alt="[ Next ]" /></TMPL_IF>&nbsp;
    44<TMPL_IF navlast><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=<TMPL_VAR NAME=curpage>&amp;offset=<TMPL_VAR NAME=lastoffs><TMPL_IF id>&amp;id=<TMPL_VAR NAME=id></TMPL_IF><TMPL_IF defrec>&amp;defrec=<TMPL_VAR NAME=defrec></TMPL_IF>">last<img src="images/ffwd.png" alt="[ Last ]" /></a><TMPL_ELSE>last<img src="images/ffwd.png" alt="[ Last ]" /></TMPL_IF>&nbsp;
    5 <TMPL_IF navall><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=<TMPL_VAR NAME=curpage>&amp;offset=all<TMPL_IF id>&amp;id=<TMPL_VAR NAME=id></TMPL_IF><TMPL_IF defrec>&defrec=<TMPL_VAR NAME=defrec></TMPL_IF>">all</a><TMPL_ELSE>all</TMPL_IF>
     5<TMPL_IF navall><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=<TMPL_VAR NAME=curpage>&amp;offset=all<TMPL_IF id>&amp;id=<TMPL_VAR NAME=id></TMPL_IF><TMPL_IF defrec>&amp;defrec=<TMPL_VAR NAME=defrec></TMPL_IF>">all</a><TMPL_ELSE>all</TMPL_IF>

  • trunk/templates/pgcount.tmpl

    r17 r39  
    1 Listing <TMPL_VAR NAME=nfirst> - <TMPL_VAR NAME=npglast> of <TMPL_VAR NAME=ntot> <TMPL_VAR NAME=pgtype><TMPL_IF NAME=parent> in <TMPL_VAR NAME=parent></TMPL_IF>
     1<TMPL_IF ntot>Listing <TMPL_VAR NAME=nfirst> - <TMPL_VAR NAME=npglast> of <TMPL_VAR NAME=ntot><TMPL_ELSE>No <TMPL_VAR NAME=pgtype></TMPL_IF><TMPL_IF NAME=parent> in <TMPL_VAR NAME=parent></TMPL_IF>

  • trunk/templates/reclist.tmpl

    r38 r39  
    33<TMPL_INCLUDE NAME="menu.tmpl">
    44
    5 <td align="center">
    6 domain details
     5<td align="center" valign="top">
     6
     7 <TMPL_IF del_failed>
     8  <div class='errmsg'>Error deleting record: <TMPL_VAR NAME=errmsg></div>
     9 </TMPL_IF>
     10
    711<!-- FIXME:  long data in records causes record list table to overflow one or another container -->
    812
    9 <!-- not sure WTF I thought I needed this for: div id=tableholder width=100% -->
     13<table><tr><td>
     14
     15<div class="center">Records<TMPL_IF NAME=parent> in <TMPL_VAR NAME=parent></TMPL_IF></div>
    1016
    1117<TMPL_INCLUDE NAME=soadata.tmpl>
    … …  
    1319<table border="0" width="100%">
    1420<tr class="darkrowheader">
    15         <td>
     21        <td colspan="2" align="left">
    1622        <TMPL_INCLUDE NAME="pgcount.tmpl">
    1723        </td>
    18         <td align="center">
     24        <td colspan="2" align="center">
    1925        <TMPL_INCLUDE NAME="fpnla.tmpl">
    2026        </td>
    21         <td>
     27        <td colspan="2" align="right">
    2228                <form action="dns.cgi">
    2329                <fieldset>
    … …  
    3036</tr>
    3137<tr class="darkrowheader">
    32         <td colspan="2">Records</td>
    33         <td align="right"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=record&amp;parentid=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;recact=new">Add record</a>
    34         <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=showlog&amp;id=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>">View log</a>
    35         </td>
     38        <td colspan="4">Records</td>
     39        <td align="right"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=record&amp;parentid=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;recact=new">Add record</a></td>
     40        <td align="right"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=showlog&amp;id=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>">View log</a></td>
    3641</tr>
    3742
    3843</table>
    3944
     45<table width="100%">
    4046<TMPL_IF reclist>
    41 <table>
    4247<tr class="darkrowheader">
    4348        <td>Name</td>
    … …  
    5459        <td><TMPL_VAR NAME=port></td>
    5560        <td><TMPL_VAR NAME=ttl></td>
    56         <td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delrec&amp;id=<TMPL_VAR NAME=record_id>&amp;defrec=<TMPL_VAR NAME=defrec>"><img src="images/trash2.png" alt="[ Delete ]" /></a></td>
     61        <td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delrec&amp;id=<TMPL_VAR NAME=record_id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;parentid=<TMPL_VAR NAME=id>"><img src="images/trash2.png" alt="[ Delete ]" /></a></td>
    5762</tr>
    5863</TMPL_LOOP>
    59 </table>
    6064<TMPL_ELSE>
    6165<tr><td colspan="5">No records found</td></tr>
    6266</TMPL_IF>
     67</table>
    6368
    6469</td></tr></table>
     70<!-- /div -->
     71
     72</td>
     73</tr>
     74</table>

  • trunk/templates/soadata.tmpl

    r38 r39  
    1 <table id="soahead" border="0" cellspacing="3" cellpadding="3" width="100%">
     1<table id="soahead" border="0" cellspacing="2" cellpadding="1" width="100%">
    22<tr class="darkrowheader">
    3         <td>SOA:</td>
    4         <td><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=editsoa&amp;recid=<TMPL_VAR NAME=recid>&amp;defrec=<TMPL_VAR NAME=defrec>">edit</a></td>
     3        <td align="left">SOA:</td>
     4        <td align="right"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=editsoa&amp;id=<TMPL_VAR NAME=id>&amp;recid=<TMPL_VAR NAME=recid>&amp;defrec=<TMPL_VAR NAME=defrec>">edit</a></td>
    55</tr>
    66</table>
    77
    8 <table id="soadetail">
     8<table id="soadetail" width="100%">
    99<tr class="datalinelight">
    1010        <td>Contact address:</td>

  • trunk/templates/updatesoa.tmpl

    r2 r39  
    1 <TMPL_IF update_failed>
    21<TMPL_INCLUDE NAME="editsoa.tmpl">
    3 <TMPL_ELSE>
    4 <TMPL_INCLUDE NAME="defrecs.tmpl">
    5 </TMPL_IF>
Note: See TracChangeset for help on using the changeset viewer.