Changeset 917


Ignore:
Timestamp:
05/01/18 15:36:23 (6 years ago)
Author:
Kris Deugau
Message:

/trunk

Continue adding a generalized block-notice system. See #17 and #23, sort of.

  • showsubs browse pages
  • IP pool list page
  • Netblock editing page
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/cgi-bin/main.cgi

    r916 r917  
    432432  $page->param(blockpctfree => sprintf("%0.1f", $pinfo->{nfree}/2**(32-$pinfo->{masklen}) * 100 ) );
    433433
     434  # retrieve any notices
     435  blocknotices($webvar{parent});
     436
    434437##fixme:  do we add a wrapper to not show the edit link for master blocks?
    435438#$page->param(editme => 1) unless $pinfo->{type} ne 'mm';
    … …  
    482485  my $plist = listPool($ip_dbh, $webvar{pool}, 1);
    483486  $page->param(poolips => $plist);
     487
     488  # retrieve any notices
     489  blocknotices($webvar{pool});
    484490} # end showPool
    485491
    … …  
    12431249  $page->param(privdata => $blockinfo->{privdata});
    12441250
     1251  # retrieve any notices
     1252  blocknotices($webvar{id});
     1253
    12451254  # ACL trickery - these two template booleans control the presence of all form/input tags
    12461255  $page->param(maychange => $IPDBacl{$authuser} =~ /c/);

  • trunk/templates/edit.tmpl

    r879 r917  
     1<TMPL_IF blockmsg><br><div class="strongwarning blockcenter w70"><TMPL_VAR NAME=blockmsg></div><br></TMPL_IF>
     2
    13<TMPL_IF webpath></TMPL_IF>
    24<div class="indent">

  • trunk/templates/listpool.tmpl

    r913 r917  
     1<TMPL_IF blockmsg><br><div class="strongwarning blockcenter w70"><TMPL_VAR NAME=blockmsg></div><br></TMPL_IF>
     2
    13<TMPL_IF webpath></TMPL_IF>
    24<br>

  • trunk/templates/showsubs.tmpl

    r913 r917  
     1<TMPL_IF blockmsg><br><div class="strongwarning blockcenter w70"><TMPL_VAR NAME=blockmsg></div><br></TMPL_IF>
     2
    13<div class="tbltitle">Subnets in <TMPL_VAR NAME=block>
    24(<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=edit&amp;id=<TMPL_VAR NAME=self_id>&amp;basetype=b">Edit</a>)<TMPL_IF blockpctfree><br><TMPL_VAR NAME=blockpctfree>% free</TMPL_IF>

  • trunk/templates/showsubs2.tmpl

    r913 r917  
     1<TMPL_IF blockmsg><br><div class="strongwarning blockcenter w70"><TMPL_VAR NAME=blockmsg></div><br></TMPL_IF>
     2
    13<div class="tbltitle">Subnets in <TMPL_VAR NAME=block>
    24(<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=edit&amp;id=<TMPL_VAR NAME=self_id>&amp;basetype=b">Edit</a>)<TMPL_IF blockpctfree><br><TMPL_VAR NAME=blockpctfree>% free</TMPL_IF>
Note: See TracChangeset for help on using the changeset viewer.