Changeset 11095 for main/waeup.skeleton


Ignore:
Timestamp:
14 Feb 2014, 09:08:03 (11 years ago)
Author:
Henrik Bettermann
Message:

Take layout from /sources/waeup.kofa/layout and customizations from /layout.

Location:
main/waeup.skeleton/branches/uli-diazo-themed
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.skeleton/branches/uli-diazo-themed/etc/themed/debug.ini.in

    r11086 r11095  
    8686document_root = %(LAYOUT_DIR)s/static
    8787
     88[app:static_custom]
     89use = egg:Paste#static
     90document_root = %(LAYOUT_CUSTOM_DIR)s/static/
     91
    8892[composite:main]
    8993use = egg:Paste#urlmap
    9094/static = static
     95/static_custom = static_custom
    9196/ = default
    9297
    9398[filter:theme]
    9499use = egg:diazo
    95 rules = file:///%(LAYOUT_DIR)s/rules.xml
     100rules = file:///%(LAYOUT_CUSTOM_DIR)s/rules.xml
    96101prefix = /
    97102doctype = <!DOCTYPE html>
    … …  
    115120env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid1.txt
    116121# the directory where all real diazo config is done (no trailing slash)
    117 LAYOUT_DIR = ${buildout:directory}/layout
     122LAYOUT_DIR = ${buildout:directory}/sources/waeup.kofa/layout
    118123STATIC_DIR = %(LAYOUT_DIR)s/static
     124LAYOUT_CUSTOM_DIR = ${buildout:directory}/layout
     125STATIC_CUSTOM_DIR = %(LAYOUT_CUSTOM_DIR)s/static

  • main/waeup.skeleton/branches/uli-diazo-themed/etc/themed/deploy.ini.in

    r11086 r11095  
    8888document_root = %(LAYOUT_DIR)s/static/
    8989
     90[app:static_custom]
     91use = egg:Paste#static
     92document_root = %(LAYOUT_CUSTOM_DIR)s/static/
     93
    9094[composite:main]
    9195use = egg:Paste#urlmap
    9296/static = static
     97/static_custom = static_custom
    9398/ = default
    9499
    … …  
    100105[filter:theme]
    101106use = egg:diazo
    102 rules = file:///%(LAYOUT_DIR)s/rules.xml
     107rules = file:///%(LAYOUT_CUSTOM_DIR)s/rules.xml
    103108prefix = /
    104109doctype = <!DOCTYPE html>
    … …  
    115120env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid1.txt
    116121# the directory where all real diazo config is done (no trailing slash)
    117 LAYOUT_DIR = ${buildout:directory}/layout
     122LAYOUT_DIR = ${buildout:directory}/sources/waeup.kofa/layout
    118123STATIC_DIR = %(LAYOUT_DIR)s/static
     124LAYOUT_CUSTOM_DIR = ${buildout:directory}/layout
     125STATIC_CUSTOM_DIR = %(LAYOUT_CUSTOM_DIR)s/static

  • main/waeup.skeleton/branches/uli-diazo-themed/layout/theme.html

    r11064 r11095  
    1818          rel="stylesheet">
    1919    <link href="static/css/base.css" rel="stylesheet">
     20    <link href="static_custom/custom.css" rel="stylesheet">
    2021
    2122    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
    … …  
    2930
    3031    <!-- icons -->
    31     <link rel="shortcut icon" href="static/ico/favicon.ico">
     32    <link rel="shortcut icon" href="static_custom/favicon.ico">
    3233
    3334
Note: See TracChangeset for help on using the changeset viewer.