Ignore:
Timestamp:
06/23/14 17:52:37 (11 years ago)
Author:
Kris Deugau
Message:

/branches/stable

Subtle bugfix merge! All changes from /trunk r589 through r648 merged.

Location:
branches/stable
Files:
33 edited
3 copied

Legend:

Unmodified
Added
Removed

  • branches/stable

  • branches/stable/templates/axfr.tmpl

    r548 r649  
     1<body>
     2<div id="main">
     3
    14<table class="wholepage"><tr>
    25<TMPL_INCLUDE NAME="menu.tmpl">

  • branches/stable/templates/badpage.tmpl

    r548 r649  
     1<body>
     2<div id="main">
     3
    14<div id="badpage">
    25<TMPL_IF badpage>

  • branches/stable/templates/bulkchange.tmpl

    r548 r649  
     1<body>
     2<div id="main">
     3
    14<table class="wholepage"><tr>
    25<TMPL_INCLUDE NAME="menu.tmpl">

  • branches/stable/templates/bulkdomain.tmpl

    r582 r649  
     1<body onload="document.getElementById('selall').style.display='block';">
     2<div id="main">
     3
    14<table class="wholepage"><tr>
    25<TMPL_INCLUDE NAME="menu.tmpl">
    … …  
    710<fieldset>
    811
    9 <input type="hidden" name="page" value="bulkchange" />
     12<input type="hidden" name="page" value="confirmbulk" />
    1013<input type="hidden" name="offset" value="<TMPL_VAR NAME=offset>" />
    1114<input type="hidden" name="perpage" value="<TMPL_VAR NAME=perpage>" />
    … …  
    1417<tr><td>
    1518    <table border="0" cellspacing="2" cellpadding="2" width="100%">
    16         <tr class="darkrowheader"><td colspan="2" align="center">Bulk Domain Changes</td></tr>
     19        <tr class="darkrowheader"><td colspan="2" align="center">Bulk Zone Changes</td></tr>
    1720
    1821        <tr class="datalinelight">
    … …  
    2932        </tr>
    3033        <tr class="darkrowheader">
    31                 <td colspan="2" align="center">Domains to change:</td>
     34                <td colspan="2" align="center">Zones to change:</td>
    3235        </tr>
    3336        <tr class="datalinelight">
    … …  
    3538<div class="center"><TMPL_INCLUDE NAME="pgcount.tmpl"></div>
    3639<div class="center"><TMPL_INCLUDE NAME="fpnla.tmpl"></div>
     40<div class="center hidden" id="selall"><input type="checkbox" name="selall" id="master" onclick="bulk_selall();"
     41/> Select all zones on this page</div>
    3742
    3843<table>
    3944<tr>
    40 <TMPL_LOOP NAME=domtable><td><input type="checkbox" name="dom_<TMPL_VAR NAME=zoneid>" value="<TMPL_VAR NAME=zoneid>" /> <TMPL_VAR NAME=zone></td>
    41 <TMPL_IF newrow></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>
     46<TMPL_IF newrow><TMPL_UNLESS __last__></tr>
    4247<tr>
    43 </TMPL_IF></TMPL_LOOP>
     48</TMPL_UNLESS></TMPL_IF></TMPL_LOOP>
    4449</tr>
    4550</table>

  • branches/stable/templates/dberr.tmpl

    r128 r649  
     1<body>
     2<div id="main">
     3
    14<br />
    25<div class="loccenter errmsg">Database error:<br>

  • branches/stable/templates/deldom.tmpl

    r548 r649  
    11<TMPL_IF del_getconf>
     2<body>
     3<div id="main">
     4
    25<table class="wholepage"><tr>
    36<TMPL_INCLUDE NAME="menu.tmpl">

  • branches/stable/templates/delgrp.tmpl

    r548 r649  
    11<TMPL_IF del_getconf>
     2<body>
     3<div id="main">
     4
    25<table class="wholepage"><tr>
    36<TMPL_INCLUDE NAME="menu.tmpl">

  • branches/stable/templates/delloc.tmpl

    r548 r649  
    11<TMPL_IF del_getconf>
     2<body>
     3<div id="main">
     4
    25<table class="wholepage"><tr>
    36<TMPL_INCLUDE NAME="menu.tmpl">

  • branches/stable/templates/delrec.tmpl

    r548 r649  
    11<TMPL_IF del_getconf>
     2<body>
     3<div id="main">
     4
    25<table class="wholepage"><tr>
    36<TMPL_INCLUDE NAME="menu.tmpl">

  • branches/stable/templates/delrevzone.tmpl

    r548 r649  
    11<TMPL_IF del_getconf>
     2<body>
     3<div id="main">
     4
    25<table class="wholepage"><tr>
    36<TMPL_INCLUDE NAME="menu.tmpl">

  • branches/stable/templates/deluser.tmpl

    r548 r649  
    11<TMPL_IF del_getconf>
     2<body>
     3<div id="main">
     4
    25<table class="wholepage"><tr>
    36<TMPL_INCLUDE NAME="menu.tmpl">

  • branches/stable/templates/dns.css

    r548 r649  
    149149}
    150150
    151 .meat {
    152         align: center;
    153         width: 100%;
    154 }
    155151input {
    156152        font-size: 10px;
    … …  
    202198        font-size: 1.3em;
    203199}
    204 
     200.hidden {
     201        display: none;
     202}
    205203
    206204#footer {

  • branches/stable/templates/dnsq.tmpl

    r548 r649  
     1<body>
     2<div id="main">
     3
    14<table class="wholepage"><tr>
    25<TMPL_INCLUDE NAME="menu.tmpl">

  • branches/stable/templates/domlist.tmpl

    r582 r649  
     1<body>
     2<div id="main">
     3
    14<table class="wholepage"><tr>
    25<TMPL_INCLUDE NAME="menu.tmpl">

  • branches/stable/templates/edgroup.tmpl

    r548 r649  
     1<body>
     2<div id="main">
     3
    14<table class="wholepage"><tr>
    25<TMPL_INCLUDE NAME="menu.tmpl">

  • branches/stable/templates/editsoa.tmpl

    r548 r649  
     1<body>
     2<div id="main">
     3
    14<table class="wholepage"><tr>
    25<TMPL_INCLUDE NAME="menu.tmpl">

  • branches/stable/templates/grpman.tmpl

    r548 r649  
     1<body>
     2<div id="main">
     3
    14<table class="wholepage"><tr>
    25<TMPL_INCLUDE NAME="menu.tmpl">

  • branches/stable/templates/header.tmpl

    r548 r649  
    2424        <!-- Custom local stylesheet, if desired -->
    2525        <link rel="stylesheet" type="text/css" href="local.css" />
     26
     27        <!-- sigh.  can't seem to get away from putting the whole bag
     28             of potatoes in when you only want one... -->
     29        <script src="templates/widgets.js" type="text/javascript"></script>
     30
    2631    </head>
    27 <body>
    28 <div id="main">

  • branches/stable/templates/location.tmpl

    r548 r649  
     1<body>
     2<div id="main">
     3
    14<table class="wholepage"><tr>
    25<TMPL_INCLUDE NAME="menu.tmpl">

  • branches/stable/templates/loclist.tmpl

    r548 r649  
     1<body>
     2<div id="main">
     3
    14<table class="wholepage"><tr>
    25<TMPL_INCLUDE NAME="menu.tmpl">

  • branches/stable/templates/log.tmpl

    r548 r649  
     1<body>
     2<div id="main">
     3
    14<table class="wholepage"><tr>
    25<TMPL_INCLUDE NAME="menu.tmpl">

  • branches/stable/templates/login.tmpl

    r548 r649  
     1<body>
     2<div id="main">
     3
    14<form method="post" action="<TMPL_VAR NAME=script_self>">
    25<fieldset>

  • branches/stable/templates/menu.tmpl

    r548 r649  
    1212<TMPL_IF mayimport><a href="<TMPL_VAR NAME=script_self>&amp;page=axfr">AXFR Import</a><br /></TMPL_IF>
    1313<TMPL_IF maybulk><a href="<TMPL_VAR NAME=script_self>&amp;page=bulkdomain">Bulk Domain Operations</a><br /></TMPL_IF>
     14<TMPL_IF maybulk><a href="<TMPL_VAR NAME=script_self>&amp;page=bulkrev">Bulk Reverse Zone Operations</a><br /></TMPL_IF>
    1415<br />
    1516<a href="<TMPL_VAR NAME=script_self>&amp;page=grpman"><TMPL_IF chggrps>Manage<TMPL_ELSE>View</TMPL_IF> groups</a><br />

  • branches/stable/templates/newdomain.tmpl

    r548 r649  
     1<body>
     2<div id="main">
     3
    14<table class="wholepage"><tr>
    25<TMPL_INCLUDE NAME="menu.tmpl">

  • branches/stable/templates/newgrp.tmpl

    r548 r649  
     1<body>
     2<div id="main">
     3
    14<table class="wholepage"><tr>
    25<TMPL_INCLUDE NAME="menu.tmpl">

  • branches/stable/templates/newrevzone.tmpl

    r548 r649  
     1<body>
     2<div id="main">
     3
    14<table class="wholepage"><tr>
    25<TMPL_INCLUDE NAME="menu.tmpl">

  • branches/stable/templates/reclist.tmpl

    r548 r649  
     1<body>
     2<div id="main">
     3
    14<table class="wholepage"><tr>
    25<TMPL_INCLUDE NAME="menu.tmpl">

  • branches/stable/templates/record.tmpl

    r548 r649  
     1<body>
     2<div id="main">
     3
    14<table class="wholepage"><tr>
    25<TMPL_INCLUDE NAME="menu.tmpl">
    … …  
    2326    <table border="0" cellspacing="2" cellpadding="2" width="100%">
    2427<TMPL_IF failed>        <tr><td class="errhead" colspan="2">Error <TMPL_VAR NAME=wastrying> record: <TMPL_VAR NAME=errmsg></td></tr></TMPL_IF>
    25         <tr class="tableheader"><td align="center" colspan="2"><TMPL_VAR NAME=todo>: <TMPL_VAR NAME=dohere></td></tr>
     28        <tr class="tableheader"><td align="center" colspan="2"><TMPL_VAR NAME=todo> in <TMPL_VAR NAME=dohere></td></tr>
    2629        <tr class="datalinelight">
    2730<TMPL_IF fwdzone>
    … …  
    8487        <tr class="datalinelight">
    8588                <td>Timestamp<br />(blank or 0 disables timestamp)</td>
    86                 <td>Valid <input type="radio" name="expires" value="until"<TMPL_IF stamp_until> checked="checked"</TMPL_IF>>until
    87                 <input type="radio" name="expires" value="after"<TMPL_UNLESS stamp_until> checked="checked"</TMPL_UNLESS>>after:
     89                <td>Valid <input type="radio" name="expires" value="until"<TMPL_IF stamp_until> checked="checked"</TMPL_IF> />until
     90                <input type="radio" name="expires" value="after"<TMPL_UNLESS stamp_until> checked="checked"</TMPL_UNLESS> />after:
    8891                <input type="text" name="stamp" value="<TMPL_VAR NAME=stamp>" />
    8992                </td>

  • branches/stable/templates/template.tmpl

    r548 r649  
     1<body>
     2<div id="main">
     3
    14<table class="wholepage"><tr>
    25<TMPL_INCLUDE NAME="menu.tmpl">

  • branches/stable/templates/user.tmpl

    r548 r649  
     1<body>
     2<div id="main">
     3
    14<table class="wholepage"><tr>
    25<TMPL_INCLUDE NAME="menu.tmpl">

  • branches/stable/templates/useradmin.tmpl

    r548 r649  
     1<body>
     2<div id="main">
     3
    14<table class="wholepage"><tr>
    25<TMPL_INCLUDE NAME="menu.tmpl">

  • branches/stable/templates/whoisq.tmpl

    r548 r649  
     1<body>
     2<div id="main">
     3
    14<table class="wholepage"><tr>
    25<TMPL_INCLUDE NAME="menu.tmpl">
Note: See TracChangeset for help on using the changeset viewer.