Changeset 11706


Ignore:
Timestamp:
24 Jun 2014, 11:27:07 (11 years ago)
Author:
Henrik Bettermann
Message:
  • Remove waeup.kofa from sources. Use waeup.kofa PyPI package instead.
  • Copy layout folder from waeup.kofa. kofacustom.sampleuni uses its own Diazo layout.
Location:
main/kofacustom.sampleuni/trunk
Files:
94 added
6 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • main/kofacustom.sampleuni/trunk/CHANGES.txt

    r11698 r11706  
    55===================
    66
    7 * no changes yet
     7* Remove waeup.kofa from sources. Use waeup.kofa PyPI package instead.
     8
     9* Copy layout folder from waeup.kofa. kofacustom.sampleuni uses its own Diazo
     10  layout.
    811
    9121.0 (2014-06-16)
    1013================
    1114
    12 Initial version.
     15* Initial version.

  • main/kofacustom.sampleuni/trunk/buildout.cfg

    r11698 r11706  
    22# See http://pypi.python.org/pypi/mr.developer for details
    33extensions = mr.developer
    4 # Install waeup.kofa as develop egg
    5 auto-checkout = waeup.kofa
    6 # We cannot use 'src' (the default) as the checked out projects won't
    7 # work properly with paster (paster looks up any upper directory
    8 # egg-info dirs and then complains about not-available packages).
    9 sources-dir = sources
    104develop = .
    115parts =
    … …  
    4337# (see .buildout/default.cfg in your home directory)
    4438# unless you specify an eggs-directory option here.
    45 
    46 [sources]
    47 waeup.kofa = svn https://svn.waeup.org/repos/main/waeup.kofa/trunk
    4839
    4940[kofa_params]

  • main/kofacustom.sampleuni/trunk/etc/themed/debug.ini.in

    r11272 r11706  
    8686document_root = %(LAYOUT_DIR)s/static
    8787
    88 [app:static_custom]
    89 use = egg:Paste#static
    90 document_root = %(LAYOUT_CUSTOM_DIR)s/static/
    91 
    9288[composite:main]
    9389use = egg:Paste#urlmap
    9490/static = static
    95 /static_custom = static_custom
    9691/ = default
    9792
    9893[filter:theme]
    9994use = egg:diazo
    100 rules = file:///%(LAYOUT_CUSTOM_DIR)s/rules.xml
     95rules = file:///%(LAYOUT_DIR)s/rules.xml
    10196prefix = /
    10297doctype = <!DOCTYPE html>
    … …  
    120115env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid1.txt
    121116# the directory where all real diazo config is done (no trailing slash)
    122 LAYOUT_DIR = ${buildout:directory}/sources/waeup.kofa/layout
     117LAYOUT_DIR = ${buildout:directory}/layout
    123118STATIC_DIR = %(LAYOUT_DIR)s/static
    124 LAYOUT_CUSTOM_DIR = ${buildout:directory}/layout
    125 STATIC_CUSTOM_DIR = %(LAYOUT_CUSTOM_DIR)s/static

  • main/kofacustom.sampleuni/trunk/etc/themed/deploy.ini.in

    r11272 r11706  
    8888document_root = %(LAYOUT_DIR)s/static/
    8989
    90 [app:static_custom]
    91 use = egg:Paste#static
    92 document_root = %(LAYOUT_CUSTOM_DIR)s/static/
    93 
    9490[composite:main]
    9591use = egg:Paste#urlmap
    9692/static = static
    97 /static_custom = static_custom
    9893/ = default
    9994
    … …  
    105100[filter:theme]
    106101use = egg:diazo
    107 rules = file:///%(LAYOUT_CUSTOM_DIR)s/rules.xml
     102rules = file:///%(LAYOUT_DIR)s/rules.xml
    108103prefix = /
    109104doctype = <!DOCTYPE html>
    … …  
    120115env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid1.txt
    121116# the directory where all real diazo config is done (no trailing slash)
    122 LAYOUT_DIR = ${buildout:directory}/sources/waeup.kofa/layout
     117LAYOUT_DIR = ${buildout:directory}/layout
    123118STATIC_DIR = %(LAYOUT_DIR)s/static
    124 LAYOUT_CUSTOM_DIR = ${buildout:directory}/layout
    125 STATIC_CUSTOM_DIR = %(LAYOUT_CUSTOM_DIR)s/static

  • main/kofacustom.sampleuni/trunk/etc/themed/zeo1.ini.in

    r11272 r11706  
    8888document_root = %(LAYOUT_DIR)s/static/
    8989
    90 [app:static_custom]
    91 use = egg:Paste#static
    92 document_root = %(LAYOUT_CUSTOM_DIR)s/static/
    93 
    9490[composite:main]
    9591use = egg:Paste#urlmap
    9692/static = static
    97 /static_custom = static_custom
    9893/ = default
    9994
    … …  
    107102[filter:theme]
    108103use = egg:diazo
    109 rules = file:///%(LAYOUT_CUSTOM_DIR)s/rules.xml
     104rules = file:///%(LAYOUT_DIR)s/rules.xml
    110105prefix = /
    111106doctype = <!DOCTYPE html>
    … …  
    121116env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid1.txt
    122117# the directory where all real diazo config is done (no trailing slash)
    123 LAYOUT_DIR = ${buildout:directory}/sources/waeup.kofa/layout
     118LAYOUT_DIR = ${buildout:directory}/layout
    124119STATIC_DIR = %(LAYOUT_DIR)s/static
    125 LAYOUT_CUSTOM_DIR = ${buildout:directory}/layout
    126 STATIC_CUSTOM_DIR = %(LAYOUT_CUSTOM_DIR)s/static

  • main/kofacustom.sampleuni/trunk/etc/themed/zeo2.ini.in

    r11272 r11706  
    121121env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid2.txt
    122122# the directory where all real diazo config is done (no trailing slash)
    123 LAYOUT_DIR = ${buildout:directory}/sources/waeup.kofa/layout
     123LAYOUT_DIR = ${buildout:directory}/layout
    124124STATIC_DIR = %(LAYOUT_DIR)s/static
    125 LAYOUT_CUSTOM_DIR = ${buildout:directory}/layout
    126 STATIC_CUSTOM_DIR = %(LAYOUT_CUSTOM_DIR)s/static

  • main/kofacustom.sampleuni/trunk/layout/theme.html

    r11564 r11706  
    1818          rel="stylesheet">
    1919    <link href="static/css/base.css" rel="stylesheet">
    20     <link href="static_custom/custom.css" rel="stylesheet">
     20    <link href="static/css/custom.css" rel="stylesheet">
    2121    <link href="static/css/file-upload.css" rel="stylesheet">
    2222
    … …  
    3131
    3232    <!-- icons -->
    33     <link rel="shortcut icon" href="static_custom/favicon.ico">
     33    <link rel="shortcut icon" href="static/ico/favicon.ico">
    3434
    3535
    … …  
    569569        src="static/js/kofa-datepicker.js">
    570570    </script>
    571 
    572571  </body>
    573572</html>

  • main/kofacustom.sampleuni/trunk/versions.cfg

    r11272 r11706  
    150150# Added by buildout at 2014-02-21 08:11:47.544699
    151151zc.zodbrecipes = 2.0.0
     152
     153# Added by buildout at 2014-06-24 13:10:20.531045
     154waeup.kofa = 1.2
Note: See TracChangeset for help on using the changeset viewer.