Ignore:
Timestamp:
11 Jan 2012, 22:51:42 (13 years ago)
Author:
Henrik Bettermann
Message:

Backup today's work (mainly student navigation).

Location:
main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/browser
Files:
1 added
1 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/browser/layout.py

    r7448 r7450  
    5252default_primary_nav_template.__grok_name__ = 'default_primary_nav'
    5353
    54 
    5554class action(grok.action):
    5655

  • main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/browser/resources.py

    r7443 r7450  
    252252    waeup_sirp, 'bootstrap.min.css')
    253253
     254dropdown = ResourceInclusion(
     255    waeup_sirp, 'bootstrap-dropdown.js',
     256    depends=[jquery])
     257
    254258#: Register basic SIRP CSS (which is based on ``bootstrap.min.css`` and ``base``
    255259#: as a resource.
    256260waeup_base_css = ResourceInclusion(
    257261    waeup_sirp, 'waeup-base.css',
    258     depends=[bootstrap_min, base])
     262    depends=[dropdown,bootstrap_min, base])
    259263
    260264#: The red SIRP theme registered as a resource.

  • main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/browser/static/bootstrap.min.css

    r7442 r7450  
    13351335  height: 0;
    13361336  display: inline-block;
    1337   content: "↓
    1338   ";
     1337  content: "↓";
    13391338  text-indent: -99999px;
    13401339  vertical-align: top;

  • main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/browser/static/mobile.css

    r7449 r7450  
    11.container {
    2   width: 420px;
     2  width: 480px;
    33}
    44
    55body {
    6   padding-top: 120px;
     6  padding-top: 60px;
    77}
     8
     9select {
     10  width: 60px;
     11}
     12
     13.dataTables_length {
     14    float: left;
     15    width: 40%;
     16}
     17
     18.dataTables_filter {
     19    float: right;
     20    text-align: right;
     21    width: 60%;
     22}

  • main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/browser/static/waeup-base.css

    r7449 r7450  
    99body {
    1010  padding-top: 60px;
     11  background-color: #EEEEEE;
     12}
     13
     14.content {
     15    background-color: #FFFFFF;
     16    margin-left: -20px;
     17    margin-right: -20px;
     18    padding-bottom: 20px;
     19    padding-left: 20px;
     20    padding-right: 20px;
     21    padding-top: 20px;
     22    border-top-left-radius: 4px;
     23    border-top-right-radius: 4px;
     24}
     25
     26.well {
     27    background-color: #FFFFFF;
     28}
     29
     30.breadcrumb {
     31    background-color: #FFFFFF;
     32    background-image: None;
     33    border: 0px;
    1134}
    1235
    … …  
    4063}
    4164
    42 table.display {
    43     margin-top: 25px;
     65.dataTables_filter {
     66  margin-bottom: 20px;
    4467}
    4568
    4669 /* SIRP stuff */
     70
     71.container {
     72  width: 700px;
     73}
     74
     75.actionbar {
     76  margin-bottom: 20px;
     77}
    4778
    4879.error {

  • main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/browser/templates/actionbutton.pt

    r7442 r7450  
    1 <a class="btn" tal:condition="viewlet/target_url"
     1<a class="btn actionbar" tal:condition="viewlet/target_url"
    22   tal:attributes="href viewlet/target_url">
    33  <img src="" alt="edit"

  • main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/browser/templates/certificatepage.pt

    r7446 r7450  
    3131</thead>
    3232<tbody>
    33   <tr tal:repeat="cc context/values">
     33  <tr tal:repeat="cc context/values" class="gradeC">
    3434     <td>
    3535      <span tal:content="cc/level">

  • main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/browser/templates/staffsitelayout.pt

    r7449 r7450  
    7171          </div>
    7272        </div>
    73         <div class="span12" tal:condition="provider:actionbar">
    74           <span tal:replace="structure provider:actionbar" />
    75           <br /><br />
    76         </div>
     73        <span tal:replace="structure provider:actionbar" />
    7774        <div tal:content="structure view/content"> THE CONTENT
    7875        </div>

  • main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/browser/templates/studentsitelayout.pt

    r7449 r7450  
    1010    <meta name="viewport" content="width=320, initial-scale=1, maximum-scale=1"/>
    1111    <link rel="stylesheet" media="only screen and (max-device-width: 480px)"
    12         tal:attributes="href python: view.url(layout.site, '@@/waeup.sirp.browser/mobile.css')" type="text/css" />
     12        tal:attributes="href python: view.url(layout.site, '@@/waeup.sirp.browser/mobile.css')"
     13        type="text/css" />
    1314    <link rel="shortcut icon" tal:attributes="href static/favicon.ico" type="image/x-icon" />
    1415    <link rel="alternate" type="application/rss+xml" title="RSS"
    … …  
    5253          </div>
    5354        </div>
    54         <div tal:condition="provider:actionbar">
    55           <span tal:replace="structure provider:actionbar" />
    56           <br /><br />
    57         </div>
     55        <span tal:replace="structure provider:actionbar" />
    5856        <div tal:content="structure view/content"> THE CONTENT
    5957        </div>
Note: See TracChangeset for help on using the changeset viewer.