Changeset 166 for trunk


Ignore:
Timestamp:
11/11/11 17:22:56 (13 years ago)
Author:
Kris Deugau
Message:

/trunk

Preparing for release

  • wrap debugbits output to avoid an XHTML validation warning
  • Makefile cleanup
    • remove mysterious duplication of the whole file
    • remove file list bits levt over from copy-paste from another project
    • set VERSION
    • fix up some pathnames from copy-paste
  • Fix a bunch of minor XHTML validation oopses
  • Fiddle footer again
  • Minor CSS cleanups
  • Drop in-page title heading, push [if IE] conditionals around in <head>
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile

    r114 r166  
    1 # $Id$
     1# $Id: Makefile 417 2010-06-30 21:48:03Z kdeugau $
    22# DNS Admin makefile
    33
    44PKGNAME=dnsadmin
    5 VERSION=0
     5VERSION=1.0
    66RELEASE=1
    77
    … …  
    3131        INSTALL COPYING TODO Makefile dnsadmin.spec new-dns.sql dns.sql dns.cgi DNSDB.pm \
    3232        \
    33         index.shtml
     33        index.shtml \
    3434        \
    3535        images/trash2.png images/fwd.png images/ffwd.png images/frev.png \
    3636        images/rev.png images/DESC.png images/ASC.png \
    3737        \
    38         templates/fpnla.tmpl templates/updatesoa.tmpl templates/log.tmpl templates/newgrp.tmpl \
    39         templates/lettsearch.tmpl templates/delgrp.tmpl templates/deldom.tmpl templates/footer.tmpl \
    40         templates/header.tmpl templates/reclist.tmpl templates/adddomain.tmpl templates/deluser.tmpl \
    41         templates/editsoa.tmpl templates/pgcount.tmpl templates/dns.css templates/dnsq.tmpl \
    42         templates/grptree.tmpl templates/addgroup.tmpl templates/useradmin.tmpl templates/addrec.tmpl \
    43         templates/login.tmpl templates/adduser.tmpl templates/sbox.tmpl templates/record.tmpl \
    44         templates/whoisq.tmpl templates/domlist.tmpl templates/menu.tmpl \
    45         templates/soadata.tmpl templates/newdomain.tmpl templates/grpman.tmpl templates/axfr.tmpl \
    46         templates/newuser.tmpl templates/delrec.tmpl
     38        templates/adddomain.tmpl templates/addgroup.tmpl templates/addrec.tmpl templates/adduser.tmpl \
     39        templates/axfr.tmpl templates/bulkchange.tmpl templates/bulkdomain.tmpl templates/dberr.tmpl \
     40        templates/deldom.tmpl templates/delgrp.tmpl templates/delrec.tmpl templates/deluser.tmpl \
     41        templates/dns.css templates/dnsq.tmpl templates/domlist.tmpl templates/edgroup.tmpl \
     42        templates/editsoa.tmpl templates/footer.tmpl templates/fpnla.tmpl templates/grouptree.css \
     43        templates/grouptree-ie.css templates/grpman.tmpl templates/grptree.tmpl templates/header.tmpl \
     44        templates/lettsearch.tmpl templates/login.tmpl templates/log.tmpl templates/menu.tmpl \
     45        templates/newdomain.tmpl templates/newgrp.tmpl templates/permlist_enabled.tmpl templates/permlist.tmpl \
     46        templates/pgcount.tmpl templates/reclist.tmpl templates/record.tmpl templates/sbox.tmpl \
     47        templates/soadata.tmpl templates/template.tmpl templates/updatesoa.tmpl templates/useradmin.tmpl \
     48        templates/user.tmpl templates/viadns.css templates/whoisq.tmpl \
    4749
    4850DIRS = \
    4951        images templates
    50 
    51 ##work
    52 HTML = \
    53         addmaster.html alloctypes.html assign.html changes.html compsearch.html \
    54         confirm.html confirmRemove.html editDisplay.html fb-assign.html footer.inc \
    55         header.inc help.html index.shtml ipdb.css local.css \
    56         newcity.html newnode.html nodesearch.html startsn.html updated.html
    5752
    5853IMAGES = images/logo.png
    … …  
    6459        cgi-bin/search.cgi cgi-bin/consistency-check.pl
    6560
    66 MODULES = cgi-bin/IPDB.pm
     61MODULES = DNSDB.pm
    6762
    6863CONFIGMODULES = cgi-bin/MyIPDB.pm cgi-bin/CustIDCK.pm
    … …  
    7368install:
    7469        @for i in $(HTML) $(IMAGES); do \
    75                 $(INSTALL_DATA) -D $$i $(DESTDIR)${libdir}/ipdb/$$i ; \
     70                $(INSTALL_DATA) -D $$i $(DESTDIR)${libdir}/dnsdb/$$i ; \
    7671        done
    7772        # munge in necessary 'use lib ...' bits so scripts can find MyIPDB.pm...
    7873        @for i in $(SCRIPTS) $(MODULES); do \
    79                 $(INSTALL_SCRIPT) -D $$i $(DESTDIR)${libdir}/ipdb/$$i ; \
    80                 perl -pi -e 's|##uselib##|use lib "${sysconfdir}/ipdb/";|;' $(DESTDIR)${libdir}/ipdb/$$i ; \
     74                $(INSTALL_SCRIPT) -D $$i $(DESTDIR)${libdir}/dnsdb/$$i ; \
     75                perl -pi -e 's|##uselib##|use lib "${sysconfdir}/dnsdb/";|;' $(DESTDIR)${libdir}/dnsdb/$$i ; \
    8176        done
    82         $(INSTALL) -d $(DESTDIR)${sysconfdir}/ipdb/
     77        $(INSTALL) -d $(DESTDIR)${sysconfdir}/dnsdb/
    8378        @for i in $(CONFIGMODULES) ; do \
    84                 $(INSTALL_DATA) $$i $(DESTDIR)${sysconfdir}/ipdb/ ; \
     79                $(INSTALL_DATA) $$i $(DESTDIR)${sysconfdir}/dnsdb/ ; \
    8580        done
    8681#       # and now munge MyIPDB.pm so it can find the core library
    87 #       perl -pi -e 's|##uselib##|use lib "${libdir}/ipdb";|;' $(DESTDIR)${sysconfdir}/ipdb/MyIPDB.pm
     82#       perl -pi -e 's|##uselib##|use lib "${libdir}/dnsdb";|;' $(DESTDIR)${sysconfdir}/ipdb/MyIPDB.pm
    8883
    8984#clean:
    … …  
    10297        rm -rf $(PKGNAME)-$(VERSION)
    10398        # gpg --detach-sign $(PKGNAME)-$(VERSION).tar.gz
    104 # $Id: Makefile 417 2010-06-30 21:48:03Z kdeugau $
    105 # DNS Admin makefile
    106 
    107 PKGNAME=dnsadmin
    108 VERSION=0
    109 RELEASE=1
    110 
    111 # Include some boilerplate Gnu makefile definitions.
    112 prefix = /usr/local
    113 
    114 exec_prefix = ${prefix}
    115 bindir = ${exec_prefix}/bin
    116 libdir = ${exec_prefix}/lib
    117 infodir = ${prefix}/info
    118 includedir = ${prefix}/include
    119 datadir = ${prefix}/share
    120 localedir = $(datadir)/locale
    121 sysconfdir = ${prefix}/etc
    122 mandir = ${prefix}/man
    123 
    124 INSTALL = /usr/bin/install -c
    125 INSTALL_PROGRAM = ${INSTALL}
    126 INSTALL_SCRIPT = ${INSTALL}
    127 INSTALL_DATA = ${INSTALL} -m 644
    128 INSTALLMODE= -m 0755
    129 INSTALLMODE2 = -m 0555
    130 
    131 DESTDIR =
    132 
    133 MANIFEST = \
    134         INSTALL COPYING TODO Makefile dnsadmin.spec new-dns.sql dns.sql dns.cgi DNSDB.pm \
    135         \
    136         index.shtml
    137         \
    138         images/trash2.png images/fwd.png images/ffwd.png images/frev.png \
    139         images/rev.png images/DESC.png images/ASC.png \
    140         \
    141         templates/fpnla.tmpl templates/updatesoa.tmpl templates/log.tmpl templates/newgrp.tmpl \
    142         templates/lettsearch.tmpl templates/delgrp.tmpl templates/deldom.tmpl templates/footer.tmpl \
    143         templates/header.tmpl templates/reclist.tmpl templates/adddomain.tmpl templates/deluser.tmpl \
    144         templates/editsoa.tmpl templates/pgcount.tmpl templates/dns.css templates/dnsq.tmpl \
    145         templates/grptree.tmpl templates/addgroup.tmpl templates/useradmin.tmpl templates/addrec.tmpl \
    146         templates/login.tmpl templates/adduser.tmpl templates/sbox.tmpl templates/record.tmpl \
    147         templates/whoisq.tmpl templates/domlist.tmpl templates/menu.tmpl \
    148         templates/soadata.tmpl templates/newdomain.tmpl templates/grpman.tmpl templates/axfr.tmpl \
    149         templates/newuser.tmpl templates/delrec.tmpl
    150 
    151 DIRS = \
    152         images templates
    153 
    154 ##work
    155 HTML = \
    156         addmaster.html alloctypes.html assign.html changes.html compsearch.html \
    157         confirm.html confirmRemove.html editDisplay.html fb-assign.html footer.inc \
    158         header.inc help.html index.shtml ipdb.css local.css \
    159         newcity.html newnode.html nodesearch.html startsn.html updated.html
    160 
    161 IMAGES = images/logo.png
    162 
    163 SCRIPTS = \
    164         cgi-bin/extras/db2rwhois.pl cgi-bin/combineblocks.pl cgi-bin/access-pwd-update.pl \
    165         cgi-bin/newnode.cgi cgi-bin/freespace.pl cgi-bin/admin.cgi \
    166         cgi-bin/main.cgi cgi-bin/newcity.cgi cgi-bin/allocate.pl \
    167         cgi-bin/search.cgi cgi-bin/consistency-check.pl
    168 
    169 MODULES = cgi-bin/IPDB.pm
    170 
    171 CONFIGMODULES = cgi-bin/MyIPDB.pm cgi-bin/CustIDCK.pm
    172 
    173 all:
    174         # nullop
    175 
    176 install:
    177         @for i in $(HTML) $(IMAGES); do \
    178                 $(INSTALL_DATA) -D $$i $(DESTDIR)${libdir}/ipdb/$$i ; \
    179         done
    180         # munge in necessary 'use lib ...' bits so scripts can find MyIPDB.pm...
    181         @for i in $(SCRIPTS) $(MODULES); do \
    182                 $(INSTALL_SCRIPT) -D $$i $(DESTDIR)${libdir}/ipdb/$$i ; \
    183                 perl -pi -e 's|##uselib##|use lib "${sysconfdir}/ipdb/";|;' $(DESTDIR)${libdir}/ipdb/$$i ; \
    184         done
    185         $(INSTALL) -d $(DESTDIR)${sysconfdir}/ipdb/
    186         @for i in $(CONFIGMODULES) ; do \
    187                 $(INSTALL_DATA) $$i $(DESTDIR)${sysconfdir}/ipdb/ ; \
    188         done
    189 #       # and now munge MyIPDB.pm so it can find the core library
    190 #       perl -pi -e 's|##uselib##|use lib "${libdir}/ipdb";|;' $(DESTDIR)${sysconfdir}/ipdb/MyIPDB.pm
    191 
    192 #clean:
    193 #       @for i in $(DIRS) ; do \
    194 #               $(MAKE) -C $$i clean ; \
    195 #       done
    196 
    197 dist:
    198         mkdir $(PKGNAME)-$(VERSION)
    199         tar cf - $(MANIFEST) | (cd $(PKGNAME)-$(VERSION); tar xf -)
    200         /usr/bin/perl -p -e 's/#VERSION#/$(VERSION)/;s/#RELEASE#/$(RELEASE)/;s/#BETA#//g' < $(PKGNAME).spec > $(PKGNAME)-$(VERSION)/$(PKGNAME).spec
    201         /usr/bin/perl -p -e 's/#VERSION#/$(VERSION)/;s/#RELEASE#/$(RELEASE)/;s/#BETA#//g' < INSTALL > $(PKGNAME)-$(VERSION)/INSTALL
    202         perl -pi -e 's/[\d.]+;\s*##VERSION##/$(VERSION);/;' $(PKGNAME)-$(VERSION)/cgi-bin/IPDB.pm
    203         tar cf $(PKGNAME)-$(VERSION).tar $(PKGNAME)-$(VERSION)
    204         gzip -v -f -9 $(PKGNAME)-$(VERSION).tar
    205         rm -rf $(PKGNAME)-$(VERSION)
    206         # gpg --detach-sign $(PKGNAME)-$(VERSION).tar.gz

  • trunk/dns.cgi

    r163 r166  
    14271427}
    14281428
    1429 print "<pre>\n";
    1430 foreach (@debugbits) { print; }
    1431 print "</pre>\n";
     1429if (@debugbits) {
     1430  print "<pre>\n";
     1431  foreach (@debugbits) { print; }
     1432  print "</pre>\n";
     1433}
    14321434
    14331435# spit it out

  • trunk/templates/bulkdomain.tmpl

    r112 r166  
    4040<table>
    4141<tr>
    42 <TMPL_LOOP NAME=domtable><td><input type="checkbox" name="dom_<TMPL_VAR NAME=domid>" value="<TMPL_VAR NAME=domid>"> <TMPL_VAR NAME=domain></td>
     42<TMPL_LOOP NAME=domtable><td><input type="checkbox" name="dom_<TMPL_VAR NAME=domid>" value="<TMPL_VAR NAME=domid>" /> <TMPL_VAR NAME=domain></td>
    4343<TMPL_IF newrow></tr>
    4444<tr>
    … …  
    4747</table>
    4848                </td>
     49        </tr>
     50        <tr class="darkrowheader"><td colspan="2" align="center"><input type="submit" value="Make changes" /></td></tr>
     51    </table>
    4952</td>
    50 </tr>
    51 <tr class="darkrowheader"><td colspan="2" align="center"><input type="submit" value="Make changes" /></td></tr>
    52     </table>
    53     </td>
    5453</tr>
    5554</table>

  • trunk/templates/dns.css

    r163 r166  
    106106        white-space: nowrap;
    107107        border: thin solid #000000;
    108         background-color: #ffccee;
     108        background-color: #f0f0f0;
    109109        vertical-align: top;
    110110}
    … …  
    203203
    204204
    205 #header {
    206         border-bottom: thin solid #000000;
    207         clear: both;
    208         float: left;
    209         width: 100%;
    210 }
    211205#footer {
    212206        border-top: thin solid #000000;
    213207        clear: both;
     208        margin-top: 20px;
    214209}
    215210#contact {
    … …  
    224219        float: right;
    225220        width: 100%;
     221        margin:bottom: 50px;
    226222}
    227223#login {
    228         margin: 50px auto;
     224        margin: 17% auto;
    229225        padding: 3px;
    230226        border: thin solid #000000;

  • trunk/templates/footer.tmpl

    r136 r166  
    33
    44<div id="footer">
    5 <div id="contact">contact: <a href="mailto:kdeugau@deepnet.cx">Kris Deugau</a> (c) 2008-2011 - <a href="http://www.deepnet.cx">deepnet</a><br />
     5<div id="contact">
     6<a href="https://secure.deepnet.cx/trac/dnsadmin">dnsadmin</a>
     7&copy; 2008-2011 <a href="mailto:kdeugau@deepnet.cx">Kris Deugau</a>/<a href="http://www.deepnet.cx">deepnet</a><br />
    68Written for standards-based browsers (eg <a href="http://www.firefox.com">FireFox</a>/<a href="http://www.mozilla.org">Mozilla</a>)
    79</div>

  • trunk/templates/header.tmpl

    r99 r166  
    33    <head>
    44        <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
    5         <title>tinyDNS Administration</title>
     5        <title><TMPL_IF compname><TMPL_VAR NAME=compname> - </TMPL_IF>DNS Administration</title>
    66        <!-- General stylesheet for most content, all browsers -->
    77        <link rel="stylesheet" type="text/css" href="templates/dns.css" />
    … …  
    1313        -->
    1414        <!-- Load a secondary stylesheet for the group tree for IE ... -->
    15         <![if IE]>
     15        <!-- [if IE] -->
    1616        <link rel="stylesheet" type="text/css" href="templates/grouptree-ie.css" />
    17         <![endif]>
     17        <!-- [endif] -->
    1818
    1919        <!-- ... and now override the IE glop with the nifty CSS-only collapsing tree -->
    20         <![if !IE]>
     20        <!-- [if !IE] -->
    2121        <link rel="stylesheet" type="text/css" href="templates/grouptree.css" />
    22         <![endif]>
     22        <!-- [endif] -->
    2323    </head>
    2424<body>
    25 <div id="header">
    26 <p>fobie bar bletch</p>
    27 </div>
    2825<div id="main">
Note: See TracChangeset for help on using the changeset viewer.