Changeset 453 for veekun/branches

Show
Ignore:
Timestamp:
08/25/08 02:46:54 (19 months ago)
Author:
eevee
Message:

Beginnings of the new style, tentatively named "slick" but that name is fucking stupid.

Location:
veekun/branches/layout2
Files:
11 added
1 modified

Legend:

Unmodified
Added
Removed

  • veekun/branches/layout2/templates/wrapper.tt

    r449 r453  
    1212<title>[% page_title %] - [% c.site_opts.site_title %]</title> 
    1313<link rel="shortcut icon" type="image/png" href="/images/favicon.png"/> 
    14 <link rel="stylesheet" type="text/css" href="/style/fluff/brown/global"/> 
     14<link rel="stylesheet" type="text/css" href="/style/reset.css"/> 
     15<link rel="stylesheet" type="text/css" href="/style/slick/blue/global"/> 
    1516[% FOREACH css IN extra_css %] 
    16 <link rel="stylesheet" type="text/css" href="/style/fluff/brown/[% css %]"/> 
     17<link rel="stylesheet" type="text/css" href="/style/slick/blue/[% css %]"/> 
    1718[% END %] 
    1819[% extra_headers.join("\n") %] 
    … …  
    3435<body> 
    3536<div id="header"> 
    36     <a href="/"><img src="/images/veehead.png" alt="[logo]" id="logo"/></a> 
     37    <a href="/" id="eevee"><img src="/images/header-eevee.png" alt="" title="Eevee"/></a> 
    3738    <div id="site-title">[% c.site_opts.site_title %]</div> 
    3839    <div id="page-title">[% page_header %]</div> 
    39     <form action="/dex" method="get" id="dex-lookup" class="tinyform"> <p> 
    40         Pok&eacute;dex lookup: <input type="text" name="entry" class="js-dexsuggest"/> 
    41         <input type="submit" value="Go!"/> 
    42     </p> </form> 
     40    <form id="pokedex-lookup"> 
     41        <p> 
     42            <img id="pokedex-image" src="/images/pokedex.png" alt="Pok&eacute;dex Lookup" title="Pok&eacute;dex Lookup"/> 
     43            <label> 
     44                Pok&eacute;dex 
     45                <input id="pokedex-textbox" type="text" class="js-dexsuggest"/> 
     46            </label> 
     47            <!-- XXX <input type="submit" value="Go!"/> --> 
     48        </p> 
     49    </form> 
    4350[% IF c.user %] 
    4451    <div id="login"> <form action="[% c.uri('Users', 'logout') %]" method="POST" class="tinyform"><p>Logged in as <a href="[% c.uri('Users', 'info', c.user.obj.id) %]">[% c.user.name %]</a>. <input type="submit" value="Logout"/></p></form> </div> 
    … …  
    7178[% END %] 
    7279 
    73 <!-- It would be very nice to have this below the content in the source. --> 
    74 <!-- Low-priority TODO. --> 
    75 <div id="left"> 
     80[% IF error %]<div id="error"><div class="heading">Internal <code>[% error.type %]</code> error</div><p>[% error.info %]</p></div>[%# ... %] 
     81[% ELSIF error_msg %]<div id="error"><div class="heading">Error</div><p>[% error_msg.join('<br/>') %]</p></div>[% END %] 
     82[% IF info_msg %]<div id="info"><div class="heading">FYI</div><p>[% info_msg.join('<br/>') %]</p></div>[% END %] 
     83[% IF success_msg %]<div id="success"><div class="heading">Success!</div><p>[% success_msg.join('<br/>') %]</p></div>[% END %] 
     84 
     85[%# what a clusterfuck! %] 
     86[% IF content %] 
     87<!-- necessary for OTL, alas --> 
     88<div id="content-wrapper"> 
     89<div id="content"> 
     90[% IF crumbs %]<div id="breadcrumbs">You are here: [% crumbs.join(' :: ') %]</div>[% END %] 
     91[% END # content %] 
     92[% END # skip_wrapper %] 
     93[% content %] 
     94[% UNLESS skip_wrapper %] 
     95[% IF content %] 
     96</div> 
     97</div> <!-- wrapper --> 
     98[% END # content %] 
     99 
     100<div id="navigation"> 
    76101[% cur_link_category = link_name %] 
    77102[% IF (matches = cur_link_category.match('^(.+)/')); cur_link_category = matches.0; END %] 
    78     <ul id="linkbar"> 
     103    <ul> 
    79104<!-- TODO: don't show a link at all if there are no sublinks you're allowed to see? --> 
    80105[% FOREACH link IN c.site_opts.link_list %] 
    … …  
    119144</div> 
    120145 
    121 [% IF error %]<div id="error"><div class="heading">Internal <code>[% error.type %]</code> error</div><p>[% error.info %]</p></div>[%# ... %] 
    122 [% ELSIF error_msg %]<div id="error"><div class="heading">Error</div><p>[% error_msg.join('<br/>') %]</p></div>[% END %] 
    123 [% IF info_msg %]<div id="info"><div class="heading">FYI</div><p>[% info_msg.join('<br/>') %]</p></div>[% END %] 
    124 [% IF success_msg %]<div id="success"><div class="heading">Success!</div><p>[% success_msg.join('<br/>') %]</p></div>[% END %] 
    125  
    126 [%# what a clusterfuck! %] 
    127 [% IF content %] 
    128 <div id="content"> 
    129 [% IF crumbs %]<div id="breadcrumbs">You are here: [% crumbs.join(' :: ') %]</div>[% END %] 
    130 [% END # content %] 
    131 [% END # skip_wrapper %] 
    132 [% content %] 
    133 [% UNLESS skip_wrapper %] 
    134 [% IF content %] 
    135 </div> 
    136 [% END # content %] 
    137  
    138146[% IF (c.debug OR c.req.params.dump_sql) AND querylog.count %] 
    139147<div id="debug"> 
    … …  
    162170    %]</div> 
    163171[% END %] 
    164     All content copyright its original owners.  Pok&eacute;mon is copyright to Nintendo and Game Freak.  Current site layout by Eevee/Alex Munroe and is &copy;2005. <br/> 
     172    <p> All content copyright its original owners.  Pok&eacute;mon is copyright to Nintendo and Game Freak.  Current site layout by Eevee/Alex Munroe and is &copy;2005. </p> 
    165173[% IF from_cache %] 
    166     This page was retrieved from cache by a team of <a href="[% c.uri('Dex', 'pokemon', 'scyther') %]">Scyther</a> jounin in about [% time_delta = time - start_time; time_delta | format('%0.6f') %] seconds. <br/> 
     174    <p> This page was retrieved from cache by a team of <a href="[% c.uri('Dex', 'pokemon', 'scyther') %]">Scyther</a> jounin in about [% time_delta = time - start_time; time_delta | format('%0.6f') %] seconds. </p> 
    167175[% ELSE %] 
    168     This page was created by a team of trained <a href="[% c.uri('Dex', 'pokemon', 'ambipom') %]">Ambipom</a> in about [% time_delta = time - start_time; time_delta | format('%0.6f') %] seconds. <br/> 
     176    <p> This page was created by a team of trained <a href="[% c.uri('Dex', 'pokemon', 'ambipom') %]">Ambipom</a> in about [% time_delta = time - start_time; time_delta | format('%0.6f') %] seconds. </p> 
    169177[% END %] 
    170178[% IF querylog.count %] 
    171     [% querylog.time_elapsed | format('%0.6f') %] seconds [% IF time_delta %]or [% querylog.time_elapsed / time_delta * 100 | format('%0.3f') %]%[% END %] of that was spent running [% querylog.count %] SQL queries, an average of [% querylog.time_elapsed / querylog.count | format('%0.6f') %] seconds each. <br/> 
     179    <p> [% querylog.time_elapsed | format('%0.6f') %] seconds [% IF time_delta %]or [% querylog.time_elapsed / time_delta * 100 | format('%0.3f') %]%[% END %] of that was spent running [% querylog.count %] SQL queries, an average of [% querylog.time_elapsed / querylog.count | format('%0.6f') %] seconds each. </p> 
    172180[% ELSE %] 
    173     No SQL was used on this page. <br/> 
     181    <p> No SQL was used on this page. </p> 
    174182[% END %] 
    175183[% poketeam_count = time_delta * 10 %]