Changeset c18126 in indico


Ignore:
Timestamp:
06/07/10 18:31:06 (3 years ago)
Author:
Pedro Ferreira <jose.pedro.ferreira@…>
Branches:
master, burotel, hello-world-walkthrough, ipv6, new-webex, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1
Children:
390c35
Parents:
9e956a
git-author:
David Martín Clavo <david.martin.clavo@…> (04/16/10 21:22:41)
git-committer:
Pedro Ferreira <jose.pedro.ferreira@…> (06/07/10 18:31:06)
Message:

[FTR] Vidyo plugin version 1.0

  • also added suds to Indico dependencies
Files:
31 added
3 edited

Legend:

Unmodified
Added
Removed

  • indico/MaKaC/webinterface/stylesheets/include/indico.xsl

    r083c31 rc18126  
    868868 
    869869                  <xsl:if test="count(child::launchInfo) = 1"> 
    870                     <a href="{./launchInfo/launchLink}" id="bookingLaunchLink{./id}"> 
     870                    <a target="_blank" href="{./launchInfo/launchLink}" id="bookingLaunchLink{./id}"> 
    871871                      <xsl:value-of select="./launchInfo/launchText"/> 
    872872                    </a> 
    … …  
    894894                  <div id="collaborationInfoLine{./id}" style="visibility: hidden; overflow: hidden;"> 
    895895                    <div class="collaborationDisplayInfoLine"> 
    896                     <table> 
     896                    <table cellpadding="0" cellspacing="0"> 
    897897                      <tbody> 
    898898                        <xsl:for-each select="./information/section"> 

  • indico/htdocs/css/Default.css

    r9e956a rc18126  
    45394539    padding: 0px; 
    45404540    padding-right: 10px; 
     4541    padding-left: 5px; 
     4542    padding-bottom: 1px; 
     4543    padding-top: 1px; 
    45414544    vertical-align: top; 
    45424545    text-align: right; 
    … …  
    45514554    vertical-align: top; 
    45524555    font-size: 10px; 
     4556    padding-bottom: 1px; 
     4557    padding-top: 1px; 
     4558    padding-right: 5px; 
    45534559} 
    45544560 

  • setup.py

    r4bd376 rc18126  
    115115    These are the ones needed for runtime.''' 
    116116 
    117     base =  ['pytz', 'ZODB3>=3.8,<3.9.0a', 'zope.index', 'zope.interface', 'simplejson', 'cds-indico-extras'] 
     117    base =  ['pytz', 'ZODB3>=3.8,<3.9.0a', 'zope.index', 'zope.interface', 'simplejson', 'suds', 'cds-indico-extras'] 
    118118    if sys.version_info[1] < 5: # hashlib is part of Python 2.5+ 
    119119        base.append('hashlib') 
    … …  
    253253            prefixDir = os.getcwd() 
    254254 
    255         directories = dict((d,os.path.join(prefixDir, d)) for d in 
     255        directories = dict((d, os.path.join(prefixDir, d)) for d in 
    256256                           ['db', 'log', 'tmp', 'cache', 'archive']) 
    257257 
    … …  
    273273            # find the apache user/group 
    274274            user, group = _findApacheUserGroup(None, None) 
    275             _checkDirPermissions(directories, dbInstalledBySetupPy=directories['db'], accessuser=user, accessgroup=group) 
    276  
    277         _updateDbConfigFiles(directories['db'], directories['log'], os.path.join(sourcePath,'etc'), directories['tmp'], user) 
     275            _checkDirPermissions(directories, dbInstalledBySetupPy = directories['db'], accessuser = user, accessgroup = group) 
     276 
     277        _updateDbConfigFiles(directories['db'], directories['log'], os.path.join(sourcePath, 'etc'), directories['tmp'], user) 
    278278 
    279279        _updateMaKaCEggCache(os.path.join(os.path.dirname(__file__), 'indico', 'MaKaC', '__init__.py'), directories['tmp']) 
    … …  
    323323 
    324324    setup(name = "cds-indico", 
    325           cmdclass={'sdist': sdist_indico, 
     325          cmdclass = {'sdist': sdist_indico, 
    326326                    'bdist': _bdist_indico(dataFiles), 
    327327                    'bdist_egg': _bdist_egg_indico(dataFiles), 
    … …  
    349349          }, 
    350350          zip_safe = False, 
    351           packages = find_packages(where='indico', exclude=('htdocs',)), 
     351          packages = find_packages(where = 'indico', exclude = ('htdocs',)), 
    352352          install_requires = _getInstallRequires(), 
    353353          data_files = dataFiles, 
Note: See TracChangeset for help on using the changeset viewer.