Changeset 7442 for main


Ignore:
Timestamp:
8 Jan 2012, 15:53:12 (13 years ago)
Author:
Henrik Bettermann
Message:

Backup local changes in branch (work in progress, not yet presentable).

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

Legend:

Unmodified
Added
Removed

  • main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/accesscodes/browser.txt

    r7372 r7442  
    5858    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    5959    ...
    60     <h2>Access Code Batches</h2>
     60    ...<h2>Access Code Batches</h2>
    6161    ...
    6262    ... The following batches are available:
    … …  
    106106    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    107107    ...
    108     <h2>Access Code Batches</h2>
     108    ...<h2>Access Code Batches</h2>
    109109    ...
    110110    ... The following batches are available:
    … …  
    155155    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    156156    ...
    157     <li ...>Archived APP-2 (APP-2_archive-...-zope.mgr.csv)</li>
     157    <div ...>Archived APP-2 (APP-2_archive-...-zope.mgr.csv)</div>
    158158    ...
    159159
    … …  
    165165    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    166166    ...
    167     <li ...>No batch selected.</li>
     167    <div ...>No batch selected.</div>
    168168    ...
    169169
    … …  
    345345    >>> print browser.contents
    346346    <!DOCTYPE html ...
    347     <li class="message">APP-1-<10-DIGITS> disabled.</li>
     347    ...APP-1-<10-DIGITS> disabled.</div>
    348348    ...
    349349
    … …  
    355355    >>> print browser.contents
    356356    <!DOCTYPE html ...
    357     <li ...>APP-1-<10-DIGITS>: Disable transition not allowed.</li>
     357    <div ...>APP-1-<10-DIGITS>: Disable transition not allowed.</div>
    358358    ...
    359359
    … …  
    365365    >>> print browser.contents
    366366    <!DOCTYPE html ...
    367     <li class="message">APP-1-<10-DIGITS> (re-)enabled.</li>
     367    ...APP-1-<10-DIGITS> (re-)enabled.</div>
    368368    ...
    369369
    … …  
    375375    >>> print browser.contents
    376376    <!DOCTYPE html ...
    377     <li ...>APP-1-<10-DIGITS>: Re-enable transition not allowed.</li>
     377    <div ...>APP-1-<10-DIGITS>: Re-enable transition not allowed.</div>
    378378    ...
    379379

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

    r7401 r7442  
    5454  >>> print browser.contents
    5555  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
    56   ...<li class="message">Your message has been sent.</li>
     56  ...Your message has been sent...
    5757  ...
    5858
    … …  
    7777The edit form contains the default value for the portal skin::
    7878
    79   >>> 'waeuptheme-gray1.css' in browser.contents
     79  >>> 'waeup-base.css' in browser.contents
    8080  True
    8181
    … …  
    8585  >>> print browser.contents
    8686  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
    87   ...<li class="message">Settings have been saved.</li>
     87  ...Settings have been saved...
    8888  ...
    8989
    … …  
    9292  >>> print browser.contents
    9393  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
    94   ...<li class="message">Plugins were updated. See log file for details.</li>
     94  ...Plugins were updated. See log file for details...
    9595  ...
    9696
    … …  
    195195  >>> print browser.contents
    196196  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
    197   ...<li class="message">Your message has been sent.</li>
     197  ...Your message has been sent...
    198198  ...
    199199
    … …  
    214214  >>> print browser.contents
    215215  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
    216   ...<span class="required">*</span>
     216  ...*...
    217217  ...<span>Name of faculty</span>:
    218218  ...
    … …  
    371371  >>> print browser.contents
    372372  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
    373   ...<span class="required">*</span>
     373  ...*</span>
    374374  ...<span>Name of department</span>:
    375375  ...
    … …  
    400400  >>> print browser.contents
    401401  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
    402   ...<li class="message">The code chosen already exists in this faculty.</li>
     402  ...The code chosen already exists in this faculty...
    403403  ...
    404404
    … …  
    535535  >>> print browser.contents
    536536  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
    537   ...<span class="required">*</span>
     537  ...*</span>
    538538  ...<span>Title of course</span>:
    539539  ...
    … …  
    574574  >>> print browser.contents
    575575  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
    576   ...<li class="message">A course with same code already exists:...</li>
     576  ...A course with same code already exists:...
    577577  ...
    578578
    … …  
    746746  >>> print browser.contents
    747747  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
    748   ...<span class="required">*</span>
     748  ...*</span>
    749749  ...<span>Title</span>:
    750750  ...
    … …  
    785785  >>> print browser.contents
    786786  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
    787   ...<li class="message">A certificate with same code already exists:...</li>
     787  ...A certificate with same code already exists:...
    788788  ...
    789789
    … …  
    950950  >>> print browser.contents
    951951  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
    952   ...<span class="required">*</span>
     952  ...*</span>
    953953  ...<span>Level</span>:
    954954  ...

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

    r7364 r7442  
    3434from waeup.sirp.interfaces import ISIRPObject, IUserAccount
    3535from waeup.sirp.browser.interfaces import ITheme
    36 from waeup.sirp.browser.theming import get_all_themes, SIRPThemeGray1
     36from waeup.sirp.browser.theming import get_all_themes, SIRPThemeBase
    3737from waeup.sirp.students.interfaces import IStudentNavigation
    3838from waeup.sirp.applicants.interfaces import IApplicant
    … …  
    7070            label = zope.i18n.translate(self.label, context=self.form.request)
    7171        return ('<input type="submit" id="%s" name="%s" value="%s"'
    72                 ' class="button" onclick="return confirmPost(%s)" />' %
     72                ' class="btn" onclick="return confirmPost(%s)" />' %
    7373                (self.__name__, self.__name__, escape(label, quote=True), self.msg)
    7474                )
    … …  
    116116        return self.url(site, name)
    117117
    118     def flash(self, message, type='message'):
     118    def flash(self, message, type='alert-message warning'):
    119119        """Send a short message to the user.
    120120        """
    … …  
    125125        return True
    126126
    127 class SIRPLayout(Layout, UtilityView):
     127class SIRPLayout(UtilityView,Layout):
    128128    """A megrok.layout.Layout with additional methods.
    129129    """
    130130    grok.baseclass()
    131131
    132 class SIRPForm(Form, UtilityView):
     132class SIRPForm(UtilityView,Form):
    133133    """A megrok.layout.Form with additional methods.
    134134    """
    … …  
    144144            self.widgets['body'].width = 35
    145145
    146 class SIRPPage(Page):
     146class SIRPPage(UtilityView,Page):
    147147    """A megrok.layout page with additional methods.
    148148    """
    149149    grok.baseclass()
    150150
    151 class SIRPDisplayFormPage(DisplayForm, UtilityView):
     151class SIRPDisplayFormPage(UtilityView,DisplayForm):
    152152    """A megrok.layout.DisplayForm with additional methods.
    153153    """
    … …  
    155155    template = default_waeup_display_template
    156156
    157 class SIRPEditFormPage(EditForm, UtilityView):
     157class SIRPEditFormPage(UtilityView,EditForm):
    158158    """A megrok.layout.EditForm with additional methods.
    159159    """
    … …  
    172172            self.widgets['notice'].height = 3
    173173
    174 class SIRPAddFormPage(AddForm,  UtilityView):
     174class SIRPAddFormPage(UtilityView,AddForm):
    175175    """A megrok.layout.AddForm with additional methods.
    176176    """
    … …  
    184184
    185185    #: An instance of the default theme to use for the site layout
    186     default_theme = SIRPThemeGray1()
     186    default_theme = SIRPThemeBase()
    187187    stafftemp = grok.PageTemplateFile('templates/staffsitelayout.pt')
    188188    studenttemp = grok.PageTemplateFile('templates/studentsitelayout.pt')

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

    r7328 r7442  
    249249                              depends=[datatables, datatables_css])
    250250
    251 #: Register basic YUI based CSS as a resource.
    252 reset_fonts_grids = ResourceInclusion(
    253     waeup_sirp, 'yuirfg.css')
    254 
    255 yuiapp_css = ResourceInclusion(
    256     waeup_sirp, 'yuiapp.css',
    257     depends=[reset_fonts_grids])
    258 
    259 #: Register basic SIRP base CSS (which is based on ``yuiapp.css`` as a
    260 #: resource.
     251#: Register Twitter's Bootsrap as a resource.
     252bootstrap_min = ResourceInclusion(
     253    waeup_sirp, 'bootstrap.min.css')
     254
     255#: Register basic SIRP CSS (which is based on ``bootstrap.min.css`` and ``base``
     256#: as a resource.
    261257waeup_base_css = ResourceInclusion(
    262258    waeup_sirp, 'waeup-base.css',
    263     depends=[yuiapp_css, base])
     259    depends=[bootstrap_min, base])
    264260
    265261#: The red SIRP theme registered as a resource.
    266 waeuptheme_red1 = ResourceInclusion(
    267     waeup_sirp, 'waeuptheme-red1.css',
    268     depends=[waeup_base_css])
     262#waeuptheme_red1 = ResourceInclusion(
     263#    waeup_sirp, 'waeuptheme-red1.css',
     264#    depends=[waeup_base_css])
    269265
    270266#: The gray SIRP theme registered as a resource.
    271 waeuptheme_gray1 = ResourceInclusion(
    272     waeup_sirp, 'waeuptheme-gray1.css',
    273     depends=[waeup_base_css])
     267#waeuptheme_gray1 = ResourceInclusion(
     268#    waeup_sirp, 'waeuptheme-gray1.css',
     269#    depends=[waeup_base_css])
    274270
    275271#: A basic theme based on jQuery only (crappy yet).

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

    r7321 r7442  
    11/* This is the base stylesheet for SIRP. It defines base styles
    2 additionally or modifying yuiapp.css styles and yuirfg.css. For themes, please create
     2additionally or modifying Bootstrap styles. For themes, please create
    33a stylesheet overriding values set here in a file named
    44'waeuptheme-<SOME-NAME>.css' and include a utility and a resource in theming.py
    55and resources.py respectively. */
    6 
    7 #hd { background-color:#003366; }
    8 .block .hd { background-color:#003366; color:#fff; border-bottom:10px solid #262626; }
    9 .block .bd h1 { font-size:153.9%; color:green; margin-bottom:0.5em;}
    10 .block .bd h2 { font-size:153.9%; color:#003366; margin-bottom:0.5em;}
    11 .block .bd h3 { font-size:130%; color:#003366; margin-bottom:0.5em;}
    12 .spaces .hd { background-color:transparent; }
    13 .spaces .hd ul li { background-color:#003366; }
    14 a { color:#003366; }
    15 .tabs .hd ul li a:hover { background-color:#8d0399; }
    16 
    17 /***** Henrik Stuff *****/
    18 
    19 .breadcrumbs {
    20   background-color: #fff;
    21   padding: 3px;
    22   margin-bottom: 1.3em
    23 }
    24 
    25 a, table td a {
    26   text-decoration: none;
    27 }
    28 
    29 a:hover {
    30   text-decoration: underline;
    31 }
    32 
    33 .workflow {
    34   border:1px solid #1fdf00;
    35   background-color:#bbffb6;
    36   font-family: courier;
    37   font-size: 80%;
    38   padding: 4px;
    39   margin-bottom: 8px;
    40 }
    41 
    42 .form-status {
    43     border:1px solid #fbb;
    44     background-color:#fdd;
    45     text-align:center;
    46     padding: 2px;
    47 }
    48 
    49 .hint {
    50     color: #CD0A0A;
    51     padding-left: 4px;
    52 }
    53 
    54 
    55 .block {
    56     margin-bottom: 0.5em;
    57 }
    58 
    59 .block .bd {
    60     padding-bottom: 1em;
    61 }
    62 
    63 .actionButtons {
    64     padding-top: 1em;
    65 }
    66 
    67 .wfstatus {
    68   float: right;
    69 }
    70 
    71 .studentmenu {
    72   text-align: left;
    73   line-height: 2;
    74 }
    75 
    76 .error {
    77   border:0px
    78 }
    79 
    80 /* Define different styles for headlines in rendered restructured text */
    81 
    82 #rest h1 {
    83   font-size:130%;
    84 }
    85 
    86 #rest h2 {
    87   font-size:100%;
    88 }
    89 
    90 #rest h3 {
    91   font-size:100%;
    92 }
    93 
    94 
    95 #rest h4 {
    96   font-size:100%;
    97 }
    98 
    99 /* jquery-ui customizations */
    100 
    101 .ui-corner-all, .ui-corner-top {
    102   -moz-border-radius-bottomleft: 0px;
    103   -moz-border-radius-bottomright: 0px;
    104   -moz-border-radius-topleft: 7px;
    105   -moz-border-radius-topright: 7px;
    106 }
    107 
    108 .ui-widget {
    109   font-family: Verdana,Arial,sans-serif;
    110   font-size: 100%;
    111 }
    112 
    113 .ui-tabs .ui-tabs-nav li a:hover {
    114   text-decoration: underline;
    115 }
    116 
    117 .dataTables_wrapper {
    118   min-height: 100px;
    119 }
    120 
    121 .dataTables_info {
    122   padding-top: 15px;
    123   float: None;
    124 }
    125 
    126 .dataTables_paginate {
    127   padding-top: 15px;
    128 }
    129 
    130 
    131 /***** Uli Stuff *****/
    132 
    133 /* Make YUI button icons appear vertically centered... */
    134 .yui-skin-sam .yui-button a img {
    135   vertical-align: middle;
    136   margin-right: 3px;
    137   margin-top: -1px;
    138   margin-left: -2px;
    139 }
    140 
    141 /* Fix logo image height: as image is taller than h1 text, header area
    142    explodes otherwise */
    143 #logo img {
    144   margin-top: -45px;
    145   position: relative;
    146   top: 12px;
    147 }
    148 
    149 .actionbar {
    150   margin-top: -18px;
    151   margin-bottom: 18px;
    152 }
    153 
    154 /* Form labels */
    155 form label, form label span {
    156   color: #333;
    157   font-weight: bold;
    158   font-size: 100%;
    159 }
    160 
    161 /* Fixes to let tables appear correctly... */
    162 table, tr, th, td {font-family: arial,sans-serif;}
    163 
    164 /* Odd and even table rows */
    165 tr.even,
    166 .yui-skin-sam tr.yui-dt-even {
    167   background-color: #fff;
    168 }
    169 tr.odd,
    170 .yui-skin-sam tr.yui-dt-odd {
    171   background-color: #eee;
    172 }
    173 
    174 /* unselected paginator page numbers */
    175 .yui-skin-sam .yui-pg-pages a.yui-pg-page {
    176   background-color: #fff;
    177   color: #000;
    178   text-decoration: none;
    179   border: 1px solid #000;
    180   padding-left: 5px;
    181 }
    182 
    183 /* selected paginator page, hover for unselected pages */
    184 .yui-skin-sam .yui-pg-pages a.yui-pg-page:hover,
    185 .yui-skin-sam span.yui-pg-page {
    186   background-color: #000;
    187   color: #fff;
    188 }
    189 
    190 /* paginator prev, next, etc. links */
    191 .yui-skin-sam .yui-dt .yui-dt-paginator a.yui-pg-first,
    192 .yui-skin-sam .yui-dt .yui-dt-paginator a.yui-pg-previous,
    193 .yui-skin-sam .yui-dt .yui-dt-paginator a.yui-pg-last,
    194 .yui-skin-sam .yui-dt .yui-dt-paginator a.yui-pg-next {
    195   color: #000;
    196   text-decoration: none;
    197   background-color: #fff;
    198 }
    199 
    200 /* Header row */
    201 th .yui-dt-liner {
    202   color: #fff;
    203   background: #000 url();
    204 }
    205 
    206 /* Header cells text, when not selected */
    207 .yui-skin-sam .yui-dt th, .yui-skin-sam .yui-dt th a {
    208   font-weight: bold;
    209   color: #fff;
    210 }
    211 
    212 /* Sortable header cells, when selected */
    213 .yui-skin-sam th.yui-dt-desc .yui-dt-liner .yui-dt-sortable,
    214 .yui-skin-sam th.yui-dt-asc .yui-dt-liner .yui-dt-sortable {
    215   color: #000;
    216 }
    217 
    218 /* Action buttons */
    219 
    220 .yui-button {
    221         display: -moz-inline-box;
    222         display: inline-block;
    223         vertical-align: text-bottom;
    224 }
    225 .yui-button .first-child {
    226         display: block;
    227         *display: inline-block;
    228 }
    229 .yui-button button, .yui-button a {
    230         display: block;
    231         *display: inline-block;
    232         border: none;
    233         margin: 0;
    234 }
    235 .yui-button button {
    236         background-color: transparent;
    237         *overflow: visible;
    238         cursor: pointer;
    239 }
    240 .yui-button a {
    241         text-decoration: none;
    242 }
    243 .yui-skin-sam .yui-button {
    244         border-width: 1px 0;
    245         border-style: solid;
    246         border-color: #808080;
    247         background: url(sprite.png) repeat-x 0 0;
    248         margin: auto .25em;
    249 }
    250 .yui-skin-sam .yui-button .first-child {
    251         border-width: 0 1px;
    252         border-style: solid;
    253         border-color: #808080;
    254         margin: 0 -1px;
    255         _margin: 0;
    256 }
    257 .yui-skin-sam .yui-button button, .yui-skin-sam .yui-button a {
    258         padding: 0 10px;
    259         font-size: 93%;
    260         line-height: 2;
    261         *line-height: 1.7;
    262         min-height: 2em;
    263         *min-height: auto;
    264         color: #000;
    265 }
    266 .yui-skin-sam .yui-button a {
    267         *line-height: 1.875;
    268         *padding-bottom: 1px;
    269 }
    270 
    271 
    272 /* The follwing is stolen from jquery... */
    273 
    274 /* Interaction Cues
    275 ----------------------------------*/
    276 .ui-state-disabled { cursor: default !important; }
    277 
    278 
    279 /* Icons
    280 ----------------------------------*/
    281 
    282 /* states and images */
    283 .ui-icon { display: block;
    284            text-indent: -99999px; overflow: hidden;
    285            background-repeat: no-repeat; }
    286 
    287 /* states and images */
    288 .ui-icon { width: 16px; height: 16px; background-image: url(ui-icons_222222_256x240.png); }
    289 .ui-widget-content .ui-icon {background-image: url(ui-icons_222222_256x240.png); }
    290 .ui-widget-header .ui-icon {background-image: url(ui-icons_ffffff_256x240.png); }
    291 .ui-state-default .ui-icon { background-image: url(ui-icons_ef8c08_256x240.png); }
    292 .ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(ui-icons_ef8c08_256x240.png); }
    293 .ui-state-active .ui-icon {background-image: url(ui-icons_ef8c08_256x240.png); }
    294 .ui-state-highlight .ui-icon {background-image: url(ui-icons_228ef1_256x240.png); }
    295 .ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(ui-icons_e73434_256x240.png); }
    296 
    297 /* positioning */
    298 .ui-icon-carat-1-n { background-position: 0 0; }
    299 .ui-icon-carat-1-ne { background-position: -16px 0; }
    300 .ui-icon-carat-1-e { background-position: -32px 0; }
    301 .ui-icon-carat-1-se { background-position: -48px 0; }
    302 .ui-icon-carat-1-s { background-position: -64px 0; }
    303 .ui-icon-carat-1-sw { background-position: -80px 0; }
    304 .ui-icon-carat-1-w { background-position: -96px 0; }
    305 .ui-icon-carat-1-nw { background-position: -112px 0; }
    306 .ui-icon-carat-2-n-s { background-position: -128px 0; }
    307 .ui-icon-carat-2-e-w { background-position: -144px 0; }
    308 .ui-icon-triangle-1-n { background-position: 0 -16px; }
    309 .ui-icon-triangle-1-ne { background-position: -16px -16px; }
    310 .ui-icon-triangle-1-e { background-position: -32px -16px; }
    311 .ui-icon-triangle-1-se { background-position: -48px -16px; }
    312 .ui-icon-triangle-1-s { background-position: -64px -16px; }
    313 .ui-icon-triangle-1-sw { background-position: -80px -16px; }
    314 .ui-icon-triangle-1-w { background-position: -96px -16px; }
    315 .ui-icon-triangle-1-nw { background-position: -112px -16px; }
    316 .ui-icon-triangle-2-n-s { background-position: -128px -16px; }
    317 .ui-icon-triangle-2-e-w { background-position: -144px -16px; }
    318 .ui-icon-arrow-1-n { background-position: 0 -32px; }
    319 .ui-icon-arrow-1-ne { background-position: -16px -32px; }
    320 .ui-icon-arrow-1-e { background-position: -32px -32px; }
    321 .ui-icon-arrow-1-se { background-position: -48px -32px; }
    322 .ui-icon-arrow-1-s { background-position: -64px -32px; }
    323 .ui-icon-arrow-1-sw { background-position: -80px -32px; }
    324 .ui-icon-arrow-1-w { background-position: -96px -32px; }
    325 .ui-icon-arrow-1-nw { background-position: -112px -32px; }
    326 .ui-icon-arrow-2-n-s { background-position: -128px -32px; }
    327 .ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
    328 .ui-icon-arrow-2-e-w { background-position: -160px -32px; }
    329 .ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
    330 .ui-icon-arrowstop-1-n { background-position: -192px -32px; }
    331 .ui-icon-arrowstop-1-e { background-position: -208px -32px; }
    332 .ui-icon-arrowstop-1-s { background-position: -224px -32px; }
    333 .ui-icon-arrowstop-1-w { background-position: -240px -32px; }
    334 .ui-icon-arrowthick-1-n { background-position: 0 -48px; }
    335 .ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
    336 .ui-icon-arrowthick-1-e { background-position: -32px -48px; }
    337 .ui-icon-arrowthick-1-se { background-position: -48px -48px; }
    338 .ui-icon-arrowthick-1-s { background-position: -64px -48px; }
    339 .ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
    340 .ui-icon-arrowthick-1-w { background-position: -96px -48px; }
    341 .ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
    342 .ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
    343 .ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
    344 .ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
    345 .ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
    346 .ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
    347 .ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
    348 .ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
    349 .ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
    350 .ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
    351 .ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
    352 .ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
    353 .ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
    354 .ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
    355 .ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
    356 .ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
    357 .ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
    358 .ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
    359 .ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
    360 .ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
    361 .ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
    362 .ui-icon-arrow-4 { background-position: 0 -80px; }
    363 .ui-icon-arrow-4-diag { background-position: -16px -80px; }
    364 .ui-icon-extlink { background-position: -32px -80px; }
    365 .ui-icon-newwin { background-position: -48px -80px; }
    366 .ui-icon-refresh { background-position: -64px -80px; }
    367 .ui-icon-shuffle { background-position: -80px -80px; }
    368 .ui-icon-transfer-e-w { background-position: -96px -80px; }
    369 .ui-icon-transferthick-e-w { background-position: -112px -80px; }
    370 .ui-icon-folder-collapsed { background-position: 0 -96px; }
    371 .ui-icon-folder-open { background-position: -16px -96px; }
    372 .ui-icon-document { background-position: -32px -96px; }
    373 .ui-icon-document-b { background-position: -48px -96px; }
    374 .ui-icon-note { background-position: -64px -96px; }
    375 .ui-icon-mail-closed { background-position: -80px -96px; }
    376 .ui-icon-mail-open { background-position: -96px -96px; }
    377 .ui-icon-suitcase { background-position: -112px -96px; }
    378 .ui-icon-comment { background-position: -128px -96px; }
    379 .ui-icon-person { background-position: -144px -96px; }
    380 .ui-icon-print { background-position: -160px -96px; }
    381 .ui-icon-trash { background-position: -176px -96px; }
    382 .ui-icon-locked { background-position: -192px -96px; }
    383 .ui-icon-unlocked { background-position: -208px -96px; }
    384 .ui-icon-bookmark { background-position: -224px -96px; }
    385 .ui-icon-tag { background-position: -240px -96px; }
    386 .ui-icon-home { background-position: 0 -112px; }
    387 .ui-icon-flag { background-position: -16px -112px; }
    388 .ui-icon-calendar { background-position: -32px -112px; }
    389 .ui-icon-cart { background-position: -48px -112px; }
    390 .ui-icon-pencil { background-position: -64px -112px; }
    391 .ui-icon-clock { background-position: -80px -112px; }
    392 .ui-icon-disk { background-position: -96px -112px; }
    393 .ui-icon-calculator { background-position: -112px -112px; }
    394 .ui-icon-zoomin { background-position: -128px -112px; }
    395 .ui-icon-zoomout { background-position: -144px -112px; }
    396 .ui-icon-search { background-position: -160px -112px; }
    397 .ui-icon-wrench { background-position: -176px -112px; }
    398 .ui-icon-gear { background-position: -192px -112px; }
    399 .ui-icon-heart { background-position: -208px -112px; }
    400 .ui-icon-star { background-position: -224px -112px; }
    401 .ui-icon-link { background-position: -240px -112px; }
    402 .ui-icon-cancel { background-position: 0 -128px; }
    403 .ui-icon-plus { background-position: -16px -128px; }
    404 .ui-icon-plusthick { background-position: -32px -128px; }
    405 .ui-icon-minus { background-position: -48px -128px; }
    406 .ui-icon-minusthick { background-position: -64px -128px; }
    407 .ui-icon-close { background-position: -80px -128px; }
    408 .ui-icon-closethick { background-position: -96px -128px; }
    409 .ui-icon-key { background-position: -112px -128px; }
    410 .ui-icon-lightbulb { background-position: -128px -128px; }
    411 .ui-icon-scissors { background-position: -144px -128px; }
    412 .ui-icon-clipboard { background-position: -160px -128px; }
    413 .ui-icon-copy { background-position: -176px -128px; }
    414 .ui-icon-contact { background-position: -192px -128px; }
    415 .ui-icon-image { background-position: -208px -128px; }
    416 .ui-icon-video { background-position: -224px -128px; }
    417 .ui-icon-script { background-position: -240px -128px; }
    418 .ui-icon-alert { background-position: 0 -144px; }
    419 .ui-icon-info { background-position: -16px -144px; }
    420 .ui-icon-notice { background-position: -32px -144px; }
    421 .ui-icon-help { background-position: -48px -144px; }
    422 .ui-icon-check { background-position: -64px -144px; }
    423 .ui-icon-bullet { background-position: -80px -144px; }
    424 .ui-icon-radio-off { background-position: -96px -144px; }
    425 .ui-icon-radio-on { background-position: -112px -144px; }
    426 .ui-icon-pin-w { background-position: -128px -144px; }
    427 .ui-icon-pin-s { background-position: -144px -144px; }
    428 .ui-icon-play { background-position: 0 -160px; }
    429 .ui-icon-pause { background-position: -16px -160px; }
    430 .ui-icon-seek-next { background-position: -32px -160px; }
    431 .ui-icon-seek-prev { background-position: -48px -160px; }
    432 .ui-icon-seek-end { background-position: -64px -160px; }
    433 .ui-icon-seek-first { background-position: -80px -160px; }
    434 .ui-icon-stop { background-position: -96px -160px; }
    435 .ui-icon-eject { background-position: -112px -160px; }
    436 .ui-icon-volume-off { background-position: -128px -160px; }
    437 .ui-icon-volume-on { background-position: -144px -160px; }
    438 .ui-icon-power { background-position: 0 -176px; }
    439 .ui-icon-signal-diag { background-position: -16px -176px; }
    440 .ui-icon-signal { background-position: -32px -176px; }
    441 .ui-icon-battery-0 { background-position: -48px -176px; }
    442 .ui-icon-battery-1 { background-position: -64px -176px; }
    443 .ui-icon-battery-2 { background-position: -80px -176px; }
    444 .ui-icon-battery-3 { background-position: -96px -176px; }
    445 .ui-icon-circle-plus { background-position: 0 -192px; }
    446 .ui-icon-circle-minus { background-position: -16px -192px; }
    447 .ui-icon-circle-close { background-position: -32px -192px; }
    448 .ui-icon-circle-triangle-e { background-position: -48px -192px; }
    449 .ui-icon-circle-triangle-s { background-position: -64px -192px; }
    450 .ui-icon-circle-triangle-w { background-position: -80px -192px; }
    451 .ui-icon-circle-triangle-n { background-position: -96px -192px; }
    452 .ui-icon-circle-arrow-e { background-position: -112px -192px; }
    453 .ui-icon-circle-arrow-s { background-position: -128px -192px; }
    454 .ui-icon-circle-arrow-w { background-position: -144px -192px; }
    455 .ui-icon-circle-arrow-n { background-position: -160px -192px; }
    456 .ui-icon-circle-zoomin { background-position: -176px -192px; }
    457 .ui-icon-circle-zoomout { background-position: -192px -192px; }
    458 .ui-icon-circle-check { background-position: -208px -192px; }
    459 .ui-icon-circlesmall-plus { background-position: 0 -208px; }
    460 .ui-icon-circlesmall-minus { background-position: -16px -208px; }
    461 .ui-icon-circlesmall-close { background-position: -32px -208px; }
    462 .ui-icon-squaresmall-plus { background-position: -48px -208px; }
    463 .ui-icon-squaresmall-minus { background-position: -64px -208px; }
    464 .ui-icon-squaresmall-close { background-position: -80px -208px; }
    465 .ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
    466 .ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
    467 .ui-icon-grip-solid-vertical { background-position: -32px -224px; }
    468 .ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
    469 .ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
    470 .ui-icon-grip-diagonal-se { background-position: -80px -224px; }
    471 
    472 span.ui-icon {
    473                position: relative;
    474                float: left;
    475                margin-right: 4px;
    476                margin-bottom: 0pt;
    477                margin-left: -0pt;
    478                left: 0.2em;
    479 }
    480 a span.ui-icon {
    481                  margin-top: 4px;
    482                  }

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

    r6717 r7442  
    1 <span class="yui-button" tal:condition="viewlet/target_url">
    2   <span class="first-child">
    3     <a href=""
    4        tal:attributes="href viewlet/target_url">
    5       <img src="" alt="edit"
    6            tal:attributes="src viewlet/icon_url;
    7                            alt viewlet/alt"/>
    8     <span tal:content="viewlet/text">TEXT</span></a>
    9   </span>
    10 </span>
     1<a class="btn" tal:condition="viewlet/target_url"
     2   tal:attributes="href viewlet/target_url">
     3  <img src="" alt="edit"
     4   tal:attributes="src viewlet/icon_url;
     5           alt viewlet/alt"/>
     6  <span tal:replace="viewlet/text">TEXT</span>
     7</a>

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

    r5389 r7442  
    1 <div class="breadcrumbs">
    2   <span tal:repeat="item viewlet/getEntries">
    3     <a href="#"
    4        tal:attributes="href item/url">
    5       <span tal:content="item/title">
    6         Entry
    7       </span>
     1<span tal:repeat="item viewlet/getEntries">
     2  <li>
     3    <a href="#" tal:attributes="href item/url">
     4      <span tal:content="item/title">Entry</span>
    85    </a>
    9     <span tal:condition="not: repeat/item/end">
    10       >
    11     </span>
    12   </span>
    13 </div>
     6    <span tal:condition="not: repeat/item/end" class="divider">/</span>
     7  </li>
     8</span>

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

    r7112 r7442  
    11<form action="." tal:attributes="action request/URL" method="post"
    2       class="edit-form" enctype="multipart/form-data">
     2      enctype="multipart/form-data">
    33
    44  <h2 i18n:translate=""
    … …  
    2020  </div>
    2121
    22   <table class="zebra">
     22  <table>
    2323    <tbody>
    2424      <tal:block repeat="widget view/widgets">
    2525        <tr>
    26           <td class="label">
     26          <td>
    2727            <label tal:attributes="for widget/name">
    28               <span class="required" tal:condition="widget/required">*</span>
     28              <span tal:condition="widget/required">*</span>
    2929              <span i18n:translate="" tal:content="widget/label">label</span>:
    3030            </label>
    3131          </td>
    32           <td class="field">
    33             <span class="widget" tal:content="structure widget">
     32          <td>
     33            <span tal:content="structure widget">
    3434              <input type="text" />
    3535            </span>
    … …  
    3838            </tal:error>
    3939            <tal:hint tal:condition="widget/hint">
    40               <span class="hint" tal:content="structure widget/hint">hint</span>
     40              <span tal:content="structure widget/hint">hint</span>
    4141            </tal:hint>
    4242          </td>
    … …  
    4646    </tbody>
    4747  </table>
    48   <div class="actionButtons" tal:condition="view/availableActions">
     48  <div tal:condition="view/availableActions">
    4949    <input tal:repeat="action view/actions"
    5050           tal:replace="structure action/render"

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

    r6225 r7442  
    1 <ul>
    2   <li
    3     tal:repeat="message view/messages"
    4     tal:attributes="class message/type"
    5     tal:content="structure message/message">Sauron will arrive soon!
    6   </li>
    7 </ul>
     1<div
     2  tal:repeat="message view/messages"
     3  tal:attributes="class message/type"
     4  tal:content="structure message/message">Sauron will arrive soon!
     5</div>
     6

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

    r6723 r7442  
    1414            href python: view.url(layout.site, 'feed.rss')" />
    1515
     16
     17    <style type="text/css">
     18      body {
     19        padding-top: 60px;
     20      }
     21    </style>
     22
     23
     24
    1625  </head>
    17   <body class="rounded yui-skin-sam">
    18     <div id="doc3" class="yui-t1">
    19       <div id="hd" role="banner">
    20         <div id="hd">
    21           <h1 id="logo">
    22             <a href="" tal:attributes="href view/application_url">
    23               <span class="uni-logo">
    24               </span> </a>
    25             <span id="uni-title" tal:content="layout/getAppTitle"> Sample University
    26             </span> </h1>
    27           <div id="navigation" class="yui-navset" style="text-align:right;">
    28             <ul id="primary-navigation">
    29               <tal:primary_nav content="structure provider:primary_nav" />
     26  <body>
     27    <div class="topbar" data-scrollspy="scrollspy" >
     28      <div class="topbar-inner">
     29        <div class="container-fluid">
     30          <a class="brand" href="#">Acronym</a>
     31          <ul class="nav">
     32            <tal:primary_nav content="structure provider:primary_nav" />
     33          </ul>
     34          <ul class="nav secondary-nav">
     35            <li tal:condition="not: layout/isAuthenticated">
     36            <a href="#" tal:attributes="href python: view.url(layout.site, 'login')">
     37                Login
     38            </a>
     39            </li>
     40            <li tal:condition="layout/isAuthenticated">
     41            <a href="#" tal:attributes="href python: view.url(layout.site, '@@contactadmin')">
     42                Contact
     43            </a>
     44            </li>
     45            <li tal:condition="layout/isAuthenticated">
     46            <a href="#" tal:attributes="href python: view.url(context, '@@logout')">Logout</a>
     47            </li>
     48          </ul>
     49        </div>
     50      </div>
     51    </div>
     52
     53    <ul class="breadcrumb">
     54      <tal:breadcrumbs
     55            tal:condition="python: layout.isAuthenticated()"
     56            tal:content="structure provider:breadcrumbs" />
     57    </ul>
     58
     59    <div class="container-fluid">
     60      <div class="sidebar">
     61        <div class="well">
     62          <div tal:condition="layout/getStudentName">
     63            <h5 tal:content="layout/getStudentName">Student name</h5>
     64            <ul>
     65              <tal:left content="structure provider:left_studentmanage" />
    3066            </ul>
    31             <ul id="user-navigation">
    32               <li tal:condition="not: layout/isAuthenticated">
    33               <a href="#" tal:attributes="href python: view.url(layout.site, 'login')">
    34                   Login
    35               </a>
    36               </li>
    37               <li tal:condition="layout/isAuthenticated">
    38               <a href="#" tal:attributes="href python: view.url(layout.site, '@@contactadmin')">
    39                   Contact
    40               </a>
    41               </li>
    42               <li tal:condition="layout/isAuthenticated">
    43               <a href="#" tal:attributes="href python: view.url(context, '@@logout')">Logout</a>
    44               </li>
     67          </div>
     68          <div tal:condition="layout/isAuthenticated">
     69            <h5 tal:content="layout/getUserTitle">Username</h5>
     70            <ul>
     71              <tal:left content="structure provider:left" />
    4572            </ul>
    46             <div class="clear">
    47             </div>
    4873          </div>
    4974        </div>
    5075      </div>
    51       <div id="bd" role="main">
    52         <span tal:condition="python: layout.isAuthenticated()"
    53               tal:content="structure provider:breadcrumbs" />
    54 
    55         <div class="yui-b">
    56           <div class="block" tal:condition="layout/getStudentName">
    57             <div class="hd">
    58               <h2 tal:content="layout/getStudentName">Student name</h2>
    59             </div>
    60             <div class="bd">
    61               <tal:left content="structure provider:left_studentmanage" />
     76      <div class="content">
     77        <div class="row">
     78          <div class="span14"
     79              tal:define="message context/@@messages"
     80              tal:condition="python: len(message)>11">
     81            <div tal:content="structure message">
    6282            </div>
    6383          </div>
    64           <div class="block" tal:condition="layout/isAuthenticated">
    65             <div class="hd">
    66               <h2 tal:content="layout/getUserTitle">Username</h2>
    67             </div>
    68             <div class="bd">
    69               <tal:left content="structure provider:left" />
    70             </div>
     84          <div class="span14">
     85            <tal:actionbar content="structure provider:actionbar" />
     86          </div>
     87          <div class="span14">&nbsp;</div>
     88          <div class="span14" tal:content="structure view/content"> THE CONTENT
    7189          </div>
    7290        </div>
    73 
    74         <div id="yui-main">
    75           <div class="yui-b">
    76             <div class="yui-g">
    77               <div class="block">
    78                 <div class="hd" tal:condition="python: layout.isAuthenticated()">
    79                   <span tal:content="view/title"> THE CONTENT TITLE </span>
    80                   <span tal:condition="layout/getStudentName" class="wfstatus">
    81                   Sudent Id: <span tal:content="python:context.getStudent().student_id">Student Id</span>
    82                   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
    83                   State: <span tal:content="python:context.getStudent().state">State</span>
    84                   </span>
    85                 </div>
    86                 <div class="bd">
    87                   <div class="actionbar">
    88                     <tal:actionbar content="structure provider:actionbar" />
    89                   </div>
    90                   <div class="alert warning ui-state-error"
    91                       tal:define="message context/@@messages"
    92                       tal:condition="python: len(message)>11">
    93                     <span class="ui-icon ui-icon-alert">A
    94                     </span>
    95                     <span tal:content="structure message">
    96                     </span>
    97                   </div>
    98                   <div tal:replace="structure view/content"> THE CONTENT
    99                   </div>
    100                 </div>
    101               </div>
    102             </div>
    103           </div>
    104         </div>
    105 
    106       </div>
    107       <div id="ft" role="contentinfo">
    108         <p>Student Information and Registration Portal<br />
    109             Copyright &copy; WAeUP Group, 2008-2011
    110         </p>
     91        <footer>
     92          <p>Student Information and Registration Portal<br />
     93              Copyright &copy; WAeUP Group, 2008-2012
     94          </p>
     95        </footer>
    11196      </div>
    11297    </div>

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

    r7321 r7442  
    2626from waeup.sirp.browser.interfaces import ITheme
    2727from waeup.sirp.browser.resources import (
    28     waeuptheme_red1, waeuptheme_gray1, waeuptheme_empty,
    29     waeup_base_css,
     28    waeuptheme_empty, waeup_base_css,
    3029    )
    3130
    … …  
    3938        return [waeup_base_css]
    4039
    41 class SIRPThemeRed1(grok.GlobalUtility):
    42     grok.implements(ITheme)
    43     grok.name('red waeup theme')
     40#class SIRPThemeRed1(grok.GlobalUtility):
     41#    grok.implements(ITheme)
     42#    grok.name('red waeup theme')
    4443
    45     description = u"Uli's Red Theme"
     44#    description = u"Uli's Red Theme"
    4645
    47     def getResources(self):
    48         return [waeuptheme_red1]
     46#    def getResources(self):
     47#        return [waeuptheme_red1]
    4948
    50 class SIRPThemeGray1(grok.GlobalUtility):
    51     grok.implements(ITheme)
    52     grok.name('gray waeup theme')
     49#class SIRPThemeGray1(grok.GlobalUtility):
     50#    grok.implements(ITheme)
     51#    grok.name('gray waeup theme')
    5352
    54     description = u"Henrik's Gray Theme"
     53#    description = u"Henrik's Gray Theme"
    5554
    56     def getResources(self):
    57         return [waeuptheme_gray1]
     55#    def getResources(self):
     56#        return [waeuptheme_gray1]
    5857
    5958class SIRPThemeEmpty(grok.GlobalUtility):

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

    r7334 r7442  
    264264        if self.url:
    265265            if self.icon_url:
    266                 return u'<div class="portlet"><a href="%s"><img src="%s" /> %s </a></div>' % (
     266                return u'<li><a href="%s"><img src="%s" /> %s </a></li>' % (
    267267                    self.url, self.icon_url, self.title)
    268268            else:
    269                 return u'<div class="portlet"><a href="%s">%s </a></div>' % (
     269                return u'<li><a href="%s">%s </a></li>' % (
    270270                    self.url, self.title)
    271271        else:
    … …  
    290290            return ''
    291291        url = self.view.url(grok.getSite(), self.link)
    292         return u'<div class="portlet"><a href="%s">%s</a></div>' % (
     292        return u'<li"><a href="%s">%s</a></li>' % (
    293293                url, self.text)
    294294
    … …  
    325325    def render(self):
    326326        url = self.view.url(grok.getSite(), self.link)
    327         return u'<div class="portlet"><a href="%s">%s</a></div>' % (
     327        return u'<li><a href="%s">%s</a></li>' % (
    328328                url, self.text)
    329329

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

    r7404 r7442  
    5353def year_range():
    5454    curr_year = datetime.now().year
    55     return range(curr_year - 2, curr_year + 5)
     55    return range(curr_year - 4, curr_year + 5)
    5656
    5757def academic_sessions():

  • main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/students/browser_templates/fileupload.pt

    r7319 r7442  
    2121             tal:attributes="id python:('delete_%s' % viewlet.input_name);
    2222                name python:('delete_%s' % viewlet.input_name)"
    23              value="Delete attachment" class="button" />
     23             value="Delete attachment" class="btn" />
    2424      <input type="submit"
    2525               tal:attributes="id python:('upload_%s' % viewlet.input_name);
    2626                  name python:('upload_%s' % viewlet.input_name)"
    27                value="Upload new file" class="button" />
     27               value="Upload new file" class="btn" />
    2828      <span i18n:translate="">
    2929        Max. file size:

  • main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/students/viewlets.py

    r7366 r7442  
    5757    def render(self):
    5858        url = self.view.url(self.context.getStudent(), self.link)
    59         return u'<div class="portlet"><a href="%s">%s</a></div>' % (
     59        return u'<li><a href="%s">%s</a></li>' % (
    6060                url, self.text)
    6161
    … …  
    7575        if slip:
    7676            url = self.view.url(self.context,self.link)
    77             return u'<div class="portlet"><a href="%s">%s</a></div>' % (
     77            return u'<li"><a href="%s">%s</a></li>' % (
    7878                    url, self.text)
    7979        return ''
Note: See TracChangeset for help on using the changeset viewer.