Changeset 7321


Ignore:
Timestamp:
10 Dec 2011, 06:15:17 (13 years ago)
Author:
Henrik Bettermann
Message:

Replace the term 'WAeUP' by SIRP which is a WAeUP product.

Location:
main/waeup.sirp/trunk/src/waeup/sirp
Files:
85 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.sirp/trunk/src/waeup/sirp/__init__.py

    r7137 r7321  
    11import grok
    2 from waeup.sirp.interfaces import IWAeUPObject
     2from waeup.sirp.interfaces import ISIRPObject
    33from zope.annotation.attribute import AttributeAnnotations
    44from zope.annotation.interfaces import IAnnotations
    55
    6 class WAeUPAttributeAnnotations(AttributeAnnotations, grok.Adapter):
    7     """An adapter to IAnnotations for any WAeUPObject.
     6class SIRPAttributeAnnotations(AttributeAnnotations, grok.Adapter):
     7    """An adapter to IAnnotations for any SIRPObject.
    88
    9     Providing this adapter, each WAeUP object becomes (attribute)
     9    Providing this adapter, each SIRP object becomes (attribute)
    1010    annotatable.
    1111    """
    1212    grok.provides(IAnnotations)
    13     grok.context(IWAeUPObject)
     13    grok.context(ISIRPObject)

  • main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/accesscode.py

    r7195 r7321  
    3131from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
    3232from random import SystemRandom as random
    33 from waeup.sirp.interfaces import IWAeUPSIRPPluggable, IObjectHistory
     33from waeup.sirp.interfaces import ISIRPPluggable, IObjectHistory
    3434from waeup.sirp.accesscodes.interfaces import (
    3535    IAccessCode, IAccessCodeBatch, IAccessCodeBatchContainer
    … …  
    398398class AccessCodePlugin(grok.GlobalUtility):
    399399    grok.name('accesscodes')
    400     grok.implements(IWAeUPSIRPPluggable)
     400    grok.implements(ISIRPPluggable)
    401401
    402402    def setup(self, site, name, logger):

  • main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/accesscode.txt

    r6632 r7321  
    77
    88.. :NOdoctest:
    9 .. :NOlayer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
     9.. :NOlayer: waeup.sirp.testing.SIRPUnitTestLayer
    1010
    1111About access-codes
    … …  
    591591.. class:: AccessCodePlugin
    592592
    593   A `waeup.sirp` plugin that updates existing WAeUP SIRP university
     593  A `waeup.sirp` plugin that updates existing SIRP university
    594594  instances so that they provide support for access-codes.
    595595
    596   .. attribute:: grok.implements(IWAeUPSIRPPluggable)
     596  .. attribute:: grok.implements(ISIRPPluggable)
    597597  .. attribute:: grok.name('accesscodes')
    598598
    … …  
    608608
    609609  The AccessCodePlugin is available as a global named utility for the
    610   IWAeUPSIRPPluggable interface named ``accesscodes``.
     610  ISIRPPluggable interface named ``accesscodes``.
    611611
    612612  It is looked up by a university instance when created, so that this
    … …  
    615615
    616616    >>> from zope.component import getUtility
    617     >>> from waeup.sirp.interfaces import IWAeUPSIRPPluggable
    618     >>> plugin = getUtility(IWAeUPSIRPPluggable, name='accesscodes')
     617    >>> from waeup.sirp.interfaces import ISIRPPluggable
     618    >>> plugin = getUtility(ISIRPPluggable, name='accesscodes')
    619619    >>> plugin
    620620    <waeup.sirp.accesscodes.accesscodes.AccessCodePlugin object at 0x...>

  • main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser.py

    r7195 r7321  
    2222from hurry.workflow.interfaces import InvalidTransitionError
    2323from waeup.sirp.browser.resources import datatable
    24 from waeup.sirp.browser import WAeUPPage, WAeUPAddFormPage
     24from waeup.sirp.browser import SIRPPage, SIRPAddFormPage
    2525from waeup.sirp.browser.breadcrumbs import Breadcrumb
    2626from waeup.sirp.browser.viewlets import (
    2727    AdminTask, AddActionButton, SearchActionButton, BatchOpButton, ManageLink)
    28 from waeup.sirp.interfaces import IWAeUPObject
     28from waeup.sirp.interfaces import ISIRPObject
    2929
    3030from waeup.sirp.accesscodes.interfaces import (
    … …  
    3333from waeup.sirp.accesscodes.catalog import search
    3434
    35 grok.context(IWAeUPObject)
    36 
    37 class BatchContainerPage(WAeUPPage):
     35grok.context(ISIRPObject)
     36
     37class BatchContainerPage(SIRPPage):
    3838    grok.name('index')
    3939    grok.context(IAccessCodeBatchContainer)
    … …  
    6161            self.flash('Deleted batch %s' % name)
    6262
    63 class AddBatchPage(WAeUPAddFormPage):
     63class AddBatchPage(SIRPAddFormPage):
    6464    grok.name('add')
    6565    grok.context(IAccessCodeBatchContainer)
    … …  
    8989        self.redirect(self.url(self.context))
    9090
    91 class ReimportBatchPage(WAeUPPage):
     91class ReimportBatchPage(SIRPPage):
    9292    """Screen for reimporting AC batches.
    9393    """
    … …  
    123123        self.redirect(self.url(self.context))
    124124
    125 class BatchContainerSearchPage(WAeUPPage):
     125class BatchContainerSearchPage(SIRPPage):
    126126    grok.name('search')
    127127    grok.context(IAccessCodeBatchContainer)

  • main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser.txt

    r6932 r7321  
    44.. module:: waeup.sirp.accesscodes.browser
    55
    6 Here we visit the access-code related parts of a WAeUP SIRP site using
     6Here we visit the access-code related parts of a SIRP site using
    77a virtual browser.
    88

  • main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/interfaces.py

    r7195 r7321  
    2020from zope import schema
    2121from zope.interface import Interface
    22 from waeup.sirp.interfaces import IWAeUPObject
     22from waeup.sirp.interfaces import ISIRPObject
    2323
    24 class IAccessCode(IWAeUPObject):
     24class IAccessCode(ISIRPObject):
    2525    """An access code.
    2626    """
    … …  
    9191        )
    9292
    93 class IAccessCodeBatchContainer(IWAeUPObject):
     93class IAccessCodeBatchContainer(ISIRPObject):
    9494    """A container for access code batches.
    9595    """

  • main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/tests/test_accesscode.py

    r7195 r7321  
    2929from zope.testing import renormalizing
    3030from waeup.sirp.app import University
    31 from waeup.sirp.interfaces import IObjectHistory, IWAeUPSIRPPluggable
     31from waeup.sirp.interfaces import IObjectHistory, ISIRPPluggable
    3232from waeup.sirp.testing import (
    3333    FunctionalLayer, FunctionalTestCase, setUp, tearDown, getRootFolder)
    … …  
    412412    def test_iface(self):
    413413        plugin = AccessCodePlugin()
    414         assert verifyObject(IWAeUPSIRPPluggable, plugin)
    415         assert verifyClass(IWAeUPSIRPPluggable, AccessCodePlugin)
     414        assert verifyObject(ISIRPPluggable, plugin)
     415        assert verifyClass(ISIRPPluggable, AccessCodePlugin)
    416416
    417417    def test_update_w_ac_container(self):

  • main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/workflow.py

    r7195 r7321  
    2424from hurry.workflow.interfaces import IWorkflowState, IWorkflowTransitionEvent
    2525from waeup.sirp.accesscodes.interfaces import IAccessCode
    26 from waeup.sirp.interfaces import IObjectHistory, IWAeUPWorkflowInfo
    27 from waeup.sirp.workflow import WAeUPWorkflow, WAeUPWorkflowInfo
     26from waeup.sirp.interfaces import IObjectHistory, ISIRPWorkflowInfo
     27from waeup.sirp.workflow import SIRPWorkflow, SIRPWorkflowInfo
    2828
    2929INITIALIZED = 'initialized'
    … …  
    104104    )
    105105
    106 accesscode_workflow = WAeUPWorkflow(ACCESSCODE_TRANSITIONS)
     106accesscode_workflow = SIRPWorkflow(ACCESSCODE_TRANSITIONS)
    107107
    108108class AccessCodeWorkflowState(WorkflowState, grok.Adapter):
    … …  
    113113    state_id = 'wf.accesscode.id'
    114114
    115 class AccessCodeWorkflowInfo(WAeUPWorkflowInfo, grok.Adapter):
     115class AccessCodeWorkflowInfo(SIRPWorkflowInfo, grok.Adapter):
    116116    grok.context(IAccessCode)
    117     grok.provides(IWAeUPWorkflowInfo)
     117    grok.provides(ISIRPWorkflowInfo)
    118118
    119119    def __init__(self, context):

  • main/waeup.sirp/trunk/src/waeup/sirp/app.py

    r7193 r7321  
    2626from waeup.sirp.hostels.container import HostelsContainer
    2727from waeup.sirp.interfaces import (
    28     IUniversity, IWAeUPSIRPPluggable, IObjectUpgradeEvent, )
     28    IUniversity, ISIRPPluggable, IObjectUpgradeEvent, )
    2929from waeup.sirp.userscontainer import UsersContainer
    3030from waeup.sirp.utils.logger import Logger
    … …  
    6464        """Create instances of all plugins defined somewhere.
    6565        """
    66         for name, plugin in getUtilitiesFor(IWAeUPSIRPPluggable):
     66        for name, plugin in getUtilitiesFor(ISIRPPluggable):
    6767            plugin.setup(self, name, self.logger)
    6868        return
    … …  
    7676        self.logger.info('Done.')
    7777        self.logger.info('Now upgrading any plugins.')
    78         for name, plugin in getUtilitiesFor(IWAeUPSIRPPluggable):
     78        for name, plugin in getUtilitiesFor(ISIRPPluggable):
    7979            plugin.update(self, name, self.logger)
    8080        self.logger.info('Plugin update finished.')

  • main/waeup.sirp/trunk/src/waeup/sirp/app.txt

    r7172 r7321  
    1 :mod:`waeup.sirp.app` -- central components for a WAeUP portal
    2 **************************************************************
     1:mod:`waeup.sirp.app` -- central components for SIRP
     2****************************************************
    33
    44.. :doctest:
    5 .. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
     5.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
    66
    77.. module:: waeup.sirp.app
    … …  
    99.. class:: University
    1010
    11   The main WAeUP application object is given with
     11  The main SIRP application object is given with
    1212  :class:`University`. It provides the main containers as faculties,
    1313  hostels, etc.
    … …  
    7676first::
    7777
    78   >>> from waeup.sirp.interfaces import IWAeUPExporter
    79   >>> exporter = IWAeUPExporter(myuniversity)
     78  >>> from waeup.sirp.interfaces import ISIRPExporter
     79  >>> exporter = ISIRPExporter(myuniversity)
    8080  >>> exporter
    8181  <waeup.sirp.utils.importexport.Exporter object at 0x...>
    … …  
    9090memory file::
    9191
    92   >>> from waeup.sirp.interfaces import IWAeUPXMLExporter
    93   >>> exporter = IWAeUPXMLExporter(myuniversity)
     92  >>> from waeup.sirp.interfaces import ISIRPXMLExporter
     93  >>> exporter = ISIRPXMLExporter(myuniversity)
    9494  >>> f = exporter.export()
    9595  >>> f
    … …  
    103103  </pickle>
    104104
    105 WAeUP SIRP plugins
    106 ==================
     105SIRP plugins
     106============
    107107
    108108waeup.sirp provides an API to 'plugin' components. Things that should
    109 be setup at creation time of a WAeUP SIRP application can indicate
    110 that by providing a utility providing IWAeUPSIRPPlugin.
     109be setup at creation time of a SIRP application can indicate
     110that by providing a utility providing ISIRPPlugin.
    111111
    112112The plugins are looked up by an created app, which then will call the
    113113``setup()`` method of each plugin.
    114114
    115    >>> from waeup.sirp.interfaces import IWAeUPSIRPPluggable
     115   >>> from waeup.sirp.interfaces import ISIRPPluggable
    116116   >>> from zope.component import getAdapters, getUtilitiesFor
    117    >>> sorted(list(getUtilitiesFor(IWAeUPSIRPPluggable)))
     117   >>> sorted(list(getUtilitiesFor(ISIRPPluggable)))
    118118   [(u'accesscodes', <waeup.sirp.accesscodes...AccessCodePlugin ...)]
    119119
    … …  
    122122
    123123   >>> import grok
    124    >>> from waeup.sirp.interfaces import IWAeUPSIRPPluggable
     124   >>> from waeup.sirp.interfaces import ISIRPPluggable
    125125   >>> class MyPlugin(grok.GlobalUtility):
    126    ...   grok.implements(IWAeUPSIRPPluggable)
     126   ...   grok.implements(ISIRPPluggable)
    127127   ...   def setup(self, site, name, logger):
    128128   ...     print "Setup was called for"
    … …  
    136136   True
    137137
    138 and setup a new WAeUP SIRP instance, we will get a message:
     138and setup a new SIRP instance, we will get a message:
    139139
    140140   >>> from waeup.sirp.app import University

  • main/waeup.sirp/trunk/src/waeup/sirp/applicants/applicant.py

    r7270 r7321  
    2424from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
    2525from waeup.sirp.app import University
    26 from waeup.sirp.image import WAeUPImageFile
     26from waeup.sirp.image import SIRPImageFile
    2727from waeup.sirp.imagestorage import DefaultFileStoreHandler
    2828from waeup.sirp.interfaces import (
    … …  
    220220            ApplicantImageStoreHandler, self).createFile(
    221221            store, root,  filename, file_id, file)
    222         return file, path, WAeUPImageFile(
     222        return file, path, SIRPImageFile(
    223223            file_obj.filename, file_obj.data)
    224224

  • main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py

    r7318 r7321  
    3434from reportlab.platypus.tables import TableStyle
    3535from waeup.sirp.browser import (
    36     WAeUPPage, WAeUPEditFormPage, WAeUPAddFormPage, WAeUPDisplayFormPage)
     36    SIRPPage, SIRPEditFormPage, SIRPAddFormPage, SIRPDisplayFormPage)
    3737from waeup.sirp.browser.breadcrumbs import Breadcrumb
    3838from waeup.sirp.browser.layout import NullValidator
    … …  
    4141from waeup.sirp.browser.viewlets import ManageActionButton, PrimaryNavTab
    4242from waeup.sirp.interfaces import (
    43     IWAeUPObject, ILocalRolesAssignable, IExtFileStore,
     43    ISIRPObject, ILocalRolesAssignable, IExtFileStore,
    4444    IFileStoreNameChooser, IPasswordValidator, IUserAccount)
    4545from waeup.sirp.permissions import get_users_with_local_roles
    … …  
    6060from waeup.sirp.students.interfaces import IStudentsUtils
    6161
    62 grok.context(IWAeUPObject) # Make IWAeUPObject the default context
    63 
    64 class ApplicantsRootPage(WAeUPPage):
     62grok.context(ISIRPObject) # Make ISIRPObject the default context
     63
     64class ApplicantsRootPage(SIRPPage):
    6565    grok.context(IApplicantsRoot)
    6666    grok.name('index')
    … …  
    8181    text = 'Manage application section'
    8282
    83 class ApplicantsRootManageFormPage(WAeUPEditFormPage):
     83class ApplicantsRootManageFormPage(SIRPEditFormPage):
    8484    grok.context(IApplicantsRoot)
    8585    grok.name('manage')
    … …  
    151151        return del_local_roles(self,2,**data)
    152152
    153 class ApplicantsContainerAddFormPage(WAeUPAddFormPage):
     153class ApplicantsContainerAddFormPage(SIRPAddFormPage):
    154154    grok.context(IApplicantsRoot)
    155155    grok.require('waeup.manageApplication')
    … …  
    229229    """Applicants tab in primary navigation.
    230230    """
    231     grok.context(IWAeUPObject)
     231    grok.context(ISIRPObject)
    232232    grok.order(3)
    233233    grok.require('waeup.viewApplicantsTab')
    … …  
    273273        return self.view.application_url() + rel_link
    274274
    275 class ApplicantsContainerPage(WAeUPDisplayFormPage):
     275class ApplicantsContainerPage(SIRPDisplayFormPage):
    276276    """The standard view for regular applicant containers.
    277277    """
    … …  
    311311#    target = 'login'
    312312
    313 class ApplicantsContainerManageFormPage(WAeUPEditFormPage):
     313class ApplicantsContainerManageFormPage(SIRPEditFormPage):
    314314    grok.context(IApplicantsContainer)
    315315    grok.name('manage')
    … …  
    404404        return del_local_roles(self,3,**data)
    405405
    406 class ApplicantAddFormPage(WAeUPAddFormPage):
     406class ApplicantAddFormPage(SIRPAddFormPage):
    407407    """Add-form to add an applicant.
    408408    """
    … …  
    431431        return
    432432
    433 class ApplicantDisplayFormPage(WAeUPDisplayFormPage):
     433class ApplicantDisplayFormPage(SIRPDisplayFormPage):
    434434    grok.context(IApplicant)
    435435    grok.name('index')
    … …  
    532532
    533533
    534 class OnlinePaymentDisplayFormPage(WAeUPDisplayFormPage):
     534class OnlinePaymentDisplayFormPage(SIRPDisplayFormPage):
    535535    """ Page to view an online payment ticket
    536536    """
    … …  
    700700        pdf.setAuthor('%s (%s)' % (self.request.principal.title,
    701701            self.request.principal.id))
    702         pdf.setCreator('WAeUP SIRP')
     702        pdf.setCreator('SIRP SIRP')
    703703        width, height = A4
    704704        style = getSampleStyleSheet()
    … …  
    802802    return True
    803803
    804 class ApplicantManageFormPage(WAeUPEditFormPage):
     804class ApplicantManageFormPage(SIRPEditFormPage):
    805805    """A full edit view for applicant data.
    806806    """

  • main/waeup.sirp/trunk/src/waeup/sirp/applicants/interfaces.py

    r7317 r7321  
    3030from waeup.sirp.schema import TextLineChoice
    3131from waeup.sirp.interfaces import (
    32     IWAeUPObject, year_range, validate_email, academic_sessions_vocab)
     32    ISIRPObject, year_range, validate_email, academic_sessions_vocab)
    3333from waeup.sirp.university.vocabularies import application_categories
    3434from waeup.sirp.students.vocabularies import (
    … …  
    118118            factory.container_title, factory.container_description)
    119119
    120 class IApplicantsRoot(IWAeUPObject, IContainer):
     120class IApplicantsRoot(ISIRPObject, IContainer):
    121121    """A container for university applicants containers.
    122122    """
    123123    pass
    124124
    125 class IApplicantsContainer(IWAeUPObject):
     125class IApplicantsContainer(ISIRPObject):
    126126    """An applicants container contains university applicants.
    127127
    … …  
    275275    'provider'].order =  IApplicantsContainer['provider'].order
    276276
    277 class IApplicantBaseData(IWAeUPObject):
     277class IApplicantBaseData(ISIRPObject):
    278278    """The data for an applicant.
    279279

  • main/waeup.sirp/trunk/src/waeup/sirp/applicants/root.py

    r7192 r7321  
    2323from hurry.query.interfaces import IQuery
    2424from zope.component import getUtility
    25 from waeup.sirp.interfaces import IWAeUPSIRPPluggable
     25from waeup.sirp.interfaces import ISIRPPluggable
    2626from waeup.sirp.applicants.interfaces import IApplicantsRoot
    2727from waeup.sirp.utils.helpers import get_current_principal
    … …  
    4949
    5050class ApplicantsPlugin(grok.GlobalUtility):
    51     """A WAeUPSIRPPlugin that creates an applicants root in portal.
     51    """A SIRPPlugin that creates an applicants root in portal.
    5252
    5353    This plugin should be called by a typical
    … …  
    5656    the main site configuration.
    5757
    58     Implements :class:`waeup.sirp.interfaces.IWAeUPSIRPPluggable`
     58    Implements :class:`waeup.sirp.interfaces.ISIRPPluggable`
    5959    """
    6060    grok.name('applicants')
    61     grok.implements(IWAeUPSIRPPluggable)
     61    grok.implements(ISIRPPluggable)
    6262    log_prefix = 'ApplicantsPlugin'
    6363

  • main/waeup.sirp/trunk/src/waeup/sirp/applicants/tests/test_applicant.py

    r7260 r7321  
    2626from zope.interface import verify, implements
    2727from zope.location.interfaces import ILocation
    28 from waeup.sirp.image.interfaces import IWAeUPImageFile
     28from waeup.sirp.image.interfaces import ISIRPImageFile
    2929from waeup.sirp.imagestorage import DefaultStorage
    3030from waeup.sirp.interfaces import IFileStoreHandler, IFileStoreNameChooser
    … …  
    3838class FakeImageLocation(object):
    3939    implements(ILocation)
    40     adapts(IWAeUPImageFile)
     40    adapts(ISIRPImageFile)
    4141    def __init__(self, context):
    4242        pass

  • main/waeup.sirp/trunk/src/waeup/sirp/applicants/vocabularies.py

    r7192 r7321  
    2020from zope.component import getUtility
    2121from zope.catalog.interfaces import ICatalog
    22 from waeup.sirp.interfaces import SimpleWAeUPVocabulary
     22from waeup.sirp.interfaces import SimpleSIRPVocabulary
    2323from waeup.sirp.students.vocabularies import CertificateSource
    2424
    … …  
    3737    )
    3838
    39 #: A :class:`waeup.sirp.interfaces.SimpleWAeUPVocabulary` of supported
     39#: A :class:`waeup.sirp.interfaces.SimpleSIRPVocabulary` of supported
    4040#: application or screening types.
    41 application_types_vocab = SimpleWAeUPVocabulary(
     41application_types_vocab = SimpleSIRPVocabulary(
    4242    *[(x[0],x[1]) for x in APPLICATION_TYPES])
    43 application_pins_vocab = SimpleWAeUPVocabulary(
     43application_pins_vocab = SimpleSIRPVocabulary(
    4444    *[(u"%s (%s)" % (x[2],x[0]),x[2]) for x in APPLICATION_TYPES])
    4545

  • main/waeup.sirp/trunk/src/waeup/sirp/applicants/workflow.py

    r7250 r7321  
    2222from hurry.workflow.interfaces import IWorkflowState, IWorkflowTransitionEvent
    2323from waeup.sirp.applicants.interfaces import IApplicantBaseData
    24 from waeup.sirp.interfaces import IObjectHistory, IWAeUPWorkflowInfo
    25 from waeup.sirp.workflow import WAeUPWorkflow, WAeUPWorkflowInfo
     24from waeup.sirp.interfaces import IObjectHistory, ISIRPWorkflowInfo
     25from waeup.sirp.workflow import SIRPWorkflow, SIRPWorkflowInfo
    2626from waeup.sirp.utils.helpers import get_current_principal
    2727
    … …  
    127127    )
    128128
    129 application_workflow = WAeUPWorkflow(APPLICATION_TRANSITIONS)
     129application_workflow = SIRPWorkflow(APPLICATION_TRANSITIONS)
    130130
    131131class ApplicationWorkflowState(WorkflowState, grok.Adapter):
    … …  
    138138    state_id = 'wf.application.id'
    139139
    140 class ApplicationWorkflowInfo(WAeUPWorkflowInfo, grok.Adapter):
     140class ApplicationWorkflowInfo(SIRPWorkflowInfo, grok.Adapter):
    141141    """Adapter to adapt Applicant objects to workflow info objects.
    142142    """
    143143    grok.context(IApplicantBaseData)
    144     grok.provides(IWAeUPWorkflowInfo)
     144    grok.provides(ISIRPWorkflowInfo)
    145145
    146146    def __init__(self, context):

  • main/waeup.sirp/trunk/src/waeup/sirp/authentication.py

    r7315 r7321  
    1616## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1717##
    18 """Authentication for WAeUP portals.
     18"""Authentication for SIRP.
    1919"""
    2020import grok
    … …  
    6363    return principalRoleManager
    6464
    65 class WAeUPSessionCredentialsPlugin(grok.GlobalUtility,
     65class SIRPSessionCredentialsPlugin(grok.GlobalUtility,
    6666                                    SessionCredentialsPlugin):
    6767    grok.provides(ICredentialsPlugin)

  • main/waeup.sirp/trunk/src/waeup/sirp/authentication.txt

    r7185 r7321  
    1 WAeUP portal authentication
    2 ***************************
     1SIRP authentication
     2*******************
    33
    44We need to protect most pieces of our portals from unauthenticated

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/__init__.py

    r7274 r7321  
    22
    33from waeup.sirp.browser.layout import (
    4     WAeUPPage, WAeUPForm, WAeUPLayout, WAeUPDisplayFormPage, WAeUPEditFormPage,
    5     WAeUPAddFormPage, NullValidator)
     4    SIRPPage, SIRPForm, SIRPLayout, SIRPDisplayFormPage, SIRPEditFormPage,
     5    SIRPAddFormPage, NullValidator)
    66from waeup.sirp.browser.pages import ContactAdminForm
    77

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/breadcrumbs.py

    r7195 r7321  
    3333    """
    3434    grok.provides(IBreadcrumb)
    35     grok.context(interfaces.IWAeUPObject)
     35    grok.context(interfaces.ISIRPObject)
    3636    grok.name('index')
    3737

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt

    r7234 r7321  
    1 Browsing the WAeUP portal
    2 *************************
    3 
    4 Here we visit all parts of a WAeUP portal using a browser.
     1Browsing SIRP
     2*************
     3
     4Here we visit all parts of a SIRP portal using a browser.
    55
    66University

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/exceptions.py

    r7195 r7321  
    2222from zope.publisher.interfaces import INotFound
    2323from zope.security.interfaces import IUnauthorized
    24 from waeup.sirp.browser.layout import WAeUPPage
     24from waeup.sirp.browser.layout import SIRPPage
    2525
    2626grok.templatedir('templates')
    … …  
    6161
    6262
    63 class NotFoundPage(WAeUPPage):
     63class NotFoundPage(SIRPPage):
    6464    """A page rendered when an object cannot be found.
    6565

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/interfaces.py

    r7308 r7321  
    2121from zope.interface import Interface, Attribute
    2222from waeup.sirp.interfaces import (
    23     IWAeUPObject, IUniversity, IUsersContainer, IDataCenter)
     23    ISIRPObject, IUniversity, IUsersContainer, IDataCenter)
    2424from waeup.sirp.university.interfaces import (
    2525    IFacultyContainer, IFaculty, IFacultyAdd, IDepartment, IDepartmentAdd,

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py

    r7274 r7321  
    2929from zope.interface import Interface
    3030from zope.site.hooks import getSite
    31 from waeup.sirp.interfaces import IWAeUPObject, IUserAccount
     31from waeup.sirp.interfaces import ISIRPObject, IUserAccount
    3232from waeup.sirp.browser.interfaces import ITheme
    33 from waeup.sirp.browser.theming import get_all_themes, WAeUPThemeGray1
     33from waeup.sirp.browser.theming import get_all_themes, SIRPThemeGray1
    3434from waeup.sirp.students.interfaces import IStudentNavigation
    3535from waeup.sirp.applicants.interfaces import IApplicant
    … …  
    101101        return True
    102102
    103 class WAeUPLayout(Layout, UtilityView):
     103class SIRPLayout(Layout, UtilityView):
    104104    """A megrok.layout.Layout with additional methods.
    105105    """
    106106    grok.baseclass()
    107107
    108 class WAeUPForm(Form, UtilityView):
     108class SIRPForm(Form, UtilityView):
    109109    """A megrok.layout.Form with additional methods.
    110110    """
    … …  
    112112
    113113    def setUpWidgets(self,ignore_request=False):
    114         super(WAeUPForm,self).setUpWidgets(ignore_request)
     114        super(SIRPForm,self).setUpWidgets(ignore_request)
    115115        if self.widgets.get('subject'):
    116116            self.widgets['subject'].displayWidth = 45
    … …  
    120120            self.widgets['body'].width = 35
    121121
    122 class WAeUPPage(Page):
     122class SIRPPage(Page):
    123123    """A megrok.layout page with additional methods.
    124124    """
    125125    grok.baseclass()
    126126
    127 class WAeUPDisplayFormPage(DisplayForm, UtilityView):
     127class SIRPDisplayFormPage(DisplayForm, UtilityView):
    128128    """A megrok.layout.DisplayForm with additional methods.
    129129    """
    … …  
    131131    template = default_waeup_display_template
    132132
    133 class WAeUPEditFormPage(EditForm, UtilityView):
     133class SIRPEditFormPage(EditForm, UtilityView):
    134134    """A megrok.layout.EditForm with additional methods.
    135135    """
    … …  
    138138
    139139    def setUpWidgets(self,ignore_request=False):
    140         super(WAeUPEditFormPage,self).setUpWidgets(ignore_request)
     140        super(SIRPEditFormPage,self).setUpWidgets(ignore_request)
    141141        if self.widgets.get('title'):
    142142            self.widgets['title'].displayWidth = 80
    … …  
    148148            self.widgets['notice'].height = 3
    149149
    150 class WAeUPAddFormPage(AddForm,  UtilityView):
     150class SIRPAddFormPage(AddForm,  UtilityView):
    151151    """A megrok.layout.AddForm with additional methods.
    152152    """
    … …  
    154154    template = default_waeup_edit_template
    155155
    156 class SiteLayout(WAeUPLayout):
     156class SiteLayout(SIRPLayout):
    157157    """ The general site layout.
    158158    """
    159     grok.context(IWAeUPObject)
     159    grok.context(ISIRPObject)
    160160
    161161    #: An instance of the default theme to use for the site layout
    162     default_theme = WAeUPThemeGray1()
     162    default_theme = SIRPThemeGray1()
    163163    stafftemp = grok.PageTemplateFile('templates/staffsitelayout.pt')
    164164    studenttemp = grok.PageTemplateFile('templates/studentsitelayout.pt')

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py

    r7274 r7321  
    1616## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1717##
    18 """ Viewing components for WAeUP objects.
     18""" Viewing components for SIRP objects.
    1919"""
    2020import copy
    … …  
    3838from zope.session.interfaces import ISession
    3939from waeup.sirp.browser import (
    40     WAeUPPage, WAeUPForm, WAeUPEditFormPage, WAeUPAddFormPage,
    41     WAeUPDisplayFormPage, NullValidator)
     40    SIRPPage, SIRPForm, SIRPEditFormPage, SIRPAddFormPage,
     41    SIRPDisplayFormPage, NullValidator)
    4242from waeup.sirp.browser.interfaces import (
    4343    IUniversity, IFacultyContainer, IFaculty, IFacultyAdd,
    … …  
    4646from waeup.sirp.browser.resources import warning, datepicker, tabs, datatable
    4747from waeup.sirp.interfaces import(
    48     IWAeUPObject, IUsersContainer, IUserAccount, IDataCenter,
    49     IWAeUPXMLImporter, IWAeUPXMLExporter, IBatchProcessor,
     48    ISIRPObject, IUsersContainer, IUserAccount, IDataCenter,
     49    ISIRPXMLImporter, ISIRPXMLExporter, IBatchProcessor,
    5050    ILocalRolesAssignable, DuplicationError, IConfigurationContainer,
    5151    ISessionConfiguration, ISessionConfigurationAdd,
    … …  
    6060from waeup.sirp.utils.helpers import get_user_account, send_mail
    6161
    62 grok.context(IWAeUPObject)
     62grok.context(ISIRPObject)
    6363grok.templatedir('templates')
    6464
    … …  
    139139#
    140140
    141 class LoginPage(WAeUPPage):
     141class LoginPage(SIRPPage):
    142142    """A login page, available for all objects.
    143143    """
    144144    grok.name('login')
    145     grok.context(IWAeUPObject)
     145    grok.context(ISIRPObject)
    146146    grok.require('waeup.Public')
    147147    title = u'Login'
    … …  
    174174
    175175
    176 class LogoutPage(WAeUPPage):
     176class LogoutPage(SIRPPage):
    177177    """A logout page. Calling this page will log the current user out.
    178178    """
    179     grok.context(IWAeUPObject)
     179    grok.context(ISIRPObject)
    180180    grok.require('waeup.Public')
    181181    grok.name('logout')
    … …  
    185185            auth = getUtility(IAuthentication)
    186186            ILogout(auth).logout(self.request)
    187             self.flash("You have been logged out. Thanks for using WAeUP SIRP!")
     187            self.flash("You have been logged out. Thanks for using SIRP SIRP!")
    188188        self.redirect(self.application_url())
    189189
    … …  
    192192#
    193193
    194 class ContactAdminForm(WAeUPForm):
     194class ContactAdminForm(SIRPForm):
    195195    grok.name('contactadmin')
    196196    #grok.context(IUniversity)
    … …  
    263263#
    264264
    265 class UniversityPage(WAeUPDisplayFormPage):
     265class UniversityPage(SIRPDisplayFormPage):
    266266    """ The main university page.
    267267    """
    … …  
    286286        return view.widgets['frontpage']()
    287287
    288 class AdministrationPage(WAeUPPage):
     288class AdministrationPage(SIRPPage):
    289289    """ The administration overview page.
    290290    """
    … …  
    333333#
    334334
    335 class UsersContainerPage(WAeUPPage):
     335class UsersContainerPage(SIRPPage):
    336336    """Overview page for all local users.
    337337    """
    … …  
    370370        return site_roles_string
    371371
    372 class AddUserFormPage(WAeUPAddFormPage):
     372class AddUserFormPage(SIRPAddFormPage):
    373373    grok.require('waeup.manageUsers')
    374374    grok.context(IUsersContainer)
    … …  
    407407        self.redirect(self.url(self.context))
    408408
    409 class UserManageFormPage(WAeUPEditFormPage):
     409class UserManageFormPage(SIRPEditFormPage):
    410410    """Manage a user account.
    411411    """
    … …  
    499499        return "%s (%s)" % (self.context.title, self.context.__name__)
    500500
    501 class MyRolesPage(WAeUPPage):
     501class MyRolesPage(SIRPPage):
    502502    """Display site roles and local roles assigned to officers.
    503503    """
    … …  
    535535#
    536536
    537 class SearchPage(WAeUPPage):
     537class SearchPage(SIRPPage):
    538538    """General search page for the academics section.
    539539    """
    … …  
    562562#
    563563
    564 class ConfigurationContainerDisplayFormPage(WAeUPDisplayFormPage):
     564class ConfigurationContainerDisplayFormPage(SIRPDisplayFormPage):
    565565    """View page of the configuration container.
    566566    """
    … …  
    574574    form_fields['frontpage'].custom_widget = ReSTDisplayWidget
    575575
    576 class ConfigurationContainerManageFormPage(WAeUPEditFormPage):
     576class ConfigurationContainerManageFormPage(SIRPEditFormPage):
    577577    """Manage page of the configuration container. We always use the
    578578    manage page in the UI not the view page, thus we use the index name here.
    … …  
    629629        return
    630630
    631 class SessionConfigurationAddFormPage(WAeUPAddFormPage):
     631class SessionConfigurationAddFormPage(SIRPAddFormPage):
    632632    """Add a session configuration object to configuration container.
    633633    """
    … …  
    657657        return
    658658
    659 class SessionConfigurationManageFormPage(WAeUPEditFormPage):
     659class SessionConfigurationManageFormPage(SIRPEditFormPage):
    660660    """Manage session configuration object.
    661661    """
    … …  
    692692#
    693693
    694 class DatacenterPage(WAeUPPage):
     694class DatacenterPage(SIRPPage):
    695695    grok.context(IDataCenter)
    696696    grok.name('index')
    … …  
    699699    pnav = 0
    700700
    701 class DatacenterUploadPage(WAeUPPage):
     701class DatacenterUploadPage(SIRPPage):
    702702    grok.context(IDataCenter)
    703703    grok.name('upload')
    … …  
    743743        return '%s_%s%s' % (base, filtered_username, ext.lower())
    744744
    745 class DatacenterImportStep1(WAeUPPage):
     745class DatacenterImportStep1(SIRPPage):
    746746    """Manual import step 1: choose file
    747747    """
    … …  
    773773            self.redirect(self.url(self.context, '@@import2'))
    774774
    775 class DatacenterImportStep2(WAeUPPage):
     775class DatacenterImportStep2(SIRPPage):
    776776    """Manual import step 2: choose importer
    777777    """
    … …  
    891891            self.flash(warnings)
    892892
    893 class DatacenterImportStep3(WAeUPPage):
     893class DatacenterImportStep3(SIRPPage):
    894894    """Manual import step 3: modify header
    895895    """
    … …  
    995995            self.flash(warnings)
    996996
    997 class DatacenterImportStep4(WAeUPPage):
     997class DatacenterImportStep4(SIRPPage):
    998998    """Manual import step 4: do actual import
    999999    """
    … …  
    10521052                linenum - (self.warn_num)))
    10531053
    1054 class DatacenterLogsOverview(WAeUPPage):
     1054class DatacenterLogsOverview(SIRPPage):
    10551055    grok.context(IDataCenter)
    10561056    grok.name('logs')
    … …  
    10731073        self.files = self.context.getLogFiles()
    10741074
    1075 class DatacenterLogsFileview(WAeUPPage):
     1075class DatacenterLogsFileview(SIRPPage):
    10761076    grok.context(IDataCenter)
    10771077    grok.name('show')
    … …  
    10921092        self.filecontents = open(fullpath, 'rb').read()
    10931093
    1094 class DatacenterSettings(WAeUPPage):
     1094class DatacenterSettings(SIRPPage):
    10951095    grok.context(IDataCenter)
    10961096    grok.name('manage')
    … …  
    11321132
    11331133    def render(self):
    1134         exporter = IWAeUPXMLExporter(self.context)
     1134        exporter = ISIRPXMLExporter(self.context)
    11351135        xml = exporter.export().read()
    11361136        self.response.setHeader(
    … …  
    11381138        return xml
    11391139
    1140 class ImportXMLPage(WAeUPPage):
     1140class ImportXMLPage(SIRPPage):
    11411141    """Replace the context object by an object created from an XML
    11421142       representation.
    … …  
    11541154        if not xmlfile:
    11551155            return
    1156         importer = IWAeUPXMLImporter(self.context)
     1156        importer = ISIRPXMLImporter(self.context)
    11571157        obj = importer.doImport(xmlfile)
    11581158        if type(obj) != type(self.context):
    … …  
    11751175#
    11761176
    1177 class FacultyContainerPage(WAeUPPage):
     1177class FacultyContainerPage(SIRPPage):
    11781178    """ Index page for faculty containers.
    11791179    """
    … …  
    11861186    grok.template('facultypage')
    11871187
    1188 class FacultyContainerManageFormPage(WAeUPEditFormPage):
     1188class FacultyContainerManageFormPage(SIRPEditFormPage):
    11891189    """Manage the basic properties of a `Faculty` instance.
    11901190    """
    … …  
    12241224
    12251225
    1226 class FacultyAddFormPage(WAeUPAddFormPage):
     1226class FacultyAddFormPage(SIRPAddFormPage):
    12271227    """ Page form to add a new faculty to a faculty container.
    12281228    """
    … …  
    12531253# Faculty pages
    12541254#
    1255 class FacultyPage(WAeUPPage):
     1255class FacultyPage(SIRPPage):
    12561256    """Index page of faculties.
    12571257    """
    … …  
    12691269        return 'Departments'
    12701270
    1271 class FacultyManageFormPage(WAeUPEditFormPage):
     1271class FacultyManageFormPage(SIRPEditFormPage):
    12721272    """Manage the basic properties of a `Faculty` instance.
    12731273    """
    … …  
    13411341        return del_local_roles(self,3,**data)
    13421342
    1343 class DepartmentAddFormPage(WAeUPAddFormPage):
     1343class DepartmentAddFormPage(SIRPAddFormPage):
    13441344    """Add a department to a faculty.
    13451345    """
    … …  
    13741374# Department pages
    13751375#
    1376 class DepartmentPage(WAeUPPage):
     1376class DepartmentPage(SIRPPage):
    13771377    """Department index page.
    13781378    """
    … …  
    14071407            yield(dict(url=url, name=key, container=val))
    14081408
    1409 class ShowStudentsPage(WAeUPPage):
     1409class ShowStudentsPage(SIRPPage):
    14101410    """Page that lists all students in the department.
    14111411    """
    … …  
    14301430        return
    14311431
    1432 class DepartmentManageFormPage(WAeUPEditFormPage):
     1432class DepartmentManageFormPage(SIRPEditFormPage):
    14331433    """Manage the basic properties of a `Department` instance.
    14341434    """
    … …  
    15301530        return del_local_roles(self,4,**data)
    15311531
    1532 class CourseAddFormPage(WAeUPAddFormPage):
     1532class CourseAddFormPage(SIRPAddFormPage):
    15331533    """Add-form to add course to a department.
    15341534    """
    … …  
    15711571        return
    15721572
    1573 class CertificateAddFormPage(WAeUPAddFormPage):
     1573class CertificateAddFormPage(SIRPAddFormPage):
    15741574    """Add-form to add certificate to a department.
    15751575    """
    … …  
    16161616# Courses pages
    16171617#
    1618 class CoursePage(WAeUPPage):
     1618class CoursePage(SIRPPage):
    16191619    """Course index page.
    16201620    """
    … …  
    16291629        return 'Course: %s (%s)' % (self.context.title, self.context.code)
    16301630
    1631 class CourseManageFormPage(WAeUPEditFormPage):
     1631class CourseManageFormPage(SIRPEditFormPage):
    16321632    """Edit form page for courses.
    16331633    """
    … …  
    16631663# Certificate pages
    16641664#
    1665 class CertificatePage(WAeUPDisplayFormPage):
     1665class CertificatePage(SIRPDisplayFormPage):
    16661666    """Index page for certificates.
    16671667    """
    … …  
    16831683        return super(CertificatePage, self).update()
    16841684
    1685 class CertificateManageFormPage(WAeUPEditFormPage):
     1685class CertificateManageFormPage(SIRPEditFormPage):
    16861686    """Manage the properties of a `Certificate` instance.
    16871687    """
    … …  
    17381738
    17391739
    1740 class CertificateCourseAddFormPage(WAeUPAddFormPage):
     1740class CertificateCourseAddFormPage(SIRPAddFormPage):
    17411741    """Add-page to add a course ref to a certificate
    17421742    """
    … …  
    17711771# Certificate course pages...
    17721772#
    1773 class CertificateCoursePage(WAeUPPage):
     1773class CertificateCoursePage(SIRPPage):
    17741774    """CertificateCourse index page.
    17751775    """
    … …  
    17881788        return course_levels.getTerm(self.context.level).title
    17891789
    1790 class CertificateCourseManageFormPage(WAeUPEditFormPage):
     1790class CertificateCourseManageFormPage(SIRPEditFormPage):
    17911791    """Manage the basic properties of a `CertificateCourse` instance.
    17921792    """

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/resources.py

    r7280 r7321  
    257257    depends=[reset_fonts_grids])
    258258
    259 #: Register basic WAeUP base CSS (which is based on ``yuiapp.css`` as a
     259#: Register basic SIRP base CSS (which is based on ``yuiapp.css`` as a
    260260#: resource.
    261261waeup_base_css = ResourceInclusion(
    … …  
    263263    depends=[yuiapp_css, base])
    264264
    265 #: The red WAeUP theme registered as a resource.
     265#: The red SIRP theme registered as a resource.
    266266waeuptheme_red1 = ResourceInclusion(
    267267    waeup_sirp, 'waeuptheme-red1.css',
    268268    depends=[waeup_base_css])
    269269
    270 #: The gray WAeUP theme registered as a resource.
     270#: The gray SIRP theme registered as a resource.
    271271waeuptheme_gray1 = ResourceInclusion(
    272272    waeup_sirp, 'waeuptheme-gray1.css',

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/static/waeup-base.css

    r7240 r7321  
    1 /* This is the base stylesheet for WAeUP SIRP. It defines base styles
     1/* This is the base stylesheet for SIRP. It defines base styles
    22additionally or modifying yuiapp.css styles and yuirfg.css. For themes, please create
    33a stylesheet overriding values set here in a file named

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/theming.py

    r7195 r7321  
    2323from zope.interface import Interface
    2424from zope.schema.interfaces import IVocabularyFactory
    25 from waeup.sirp.interfaces import SimpleWAeUPVocabulary
     25from waeup.sirp.interfaces import SimpleSIRPVocabulary
    2626from waeup.sirp.browser.interfaces import ITheme
    2727from waeup.sirp.browser.resources import (
    … …  
    3030    )
    3131
    32 class WAeUPThemeBase(grok.GlobalUtility):
     32class SIRPThemeBase(grok.GlobalUtility):
    3333    grok.implements(ITheme)
    3434    grok.name('base waeup theme')
    … …  
    3939        return [waeup_base_css]
    4040
    41 class WAeUPThemeRed1(grok.GlobalUtility):
     41class SIRPThemeRed1(grok.GlobalUtility):
    4242    grok.implements(ITheme)
    4343    grok.name('red waeup theme')
    … …  
    4848        return [waeuptheme_red1]
    4949
    50 class WAeUPThemeGray1(grok.GlobalUtility):
     50class SIRPThemeGray1(grok.GlobalUtility):
    5151    grok.implements(ITheme)
    5252    grok.name('gray waeup theme')
    … …  
    5757        return [waeuptheme_gray1]
    5858
    59 class WAeUPThemeEmpty(grok.GlobalUtility):
     59class SIRPThemeEmpty(grok.GlobalUtility):
    6060    """A theme based on jQuery only.
    6161
    … …  
    113113        terms = [(theme.description, name)
    114114                 for name, theme in get_all_themes()]
    115         vocab = SimpleWAeUPVocabulary(*terms)
     115        vocab = SimpleSIRPVocabulary(*terms)
    116116        return vocab

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/viewlets.py

    r7243 r7321  
    2828    IFacultyContainer, IFaculty, IDepartment, ICourse, ICertificate,
    2929    ICertificateCourse, IBreadcrumbContainer, IUniversity, IUsersContainer)
    30 from waeup.sirp.interfaces import (IWAeUPObject, IWAeUPXMLExporter,
    31                                    IWAeUPXMLImporter, IDataCenter, IUserAccount)
    32 from waeup.sirp.browser.layout import WAeUPPage, default_primary_nav_template
     30from waeup.sirp.interfaces import (ISIRPObject, ISIRPXMLExporter,
     31                                   ISIRPXMLImporter, IDataCenter, IUserAccount)
     32from waeup.sirp.browser.layout import SIRPPage, default_primary_nav_template
    3333from waeup.sirp.utils.helpers import get_user_account
    3434
    3535grok.templatedir('templates')
    36 grok.context(IWAeUPObject) # Make IWAeUPObject the default context
     36grok.context(ISIRPObject) # Make ISIRPObject the default context
    3737
    3838class LeftSidebar(grok.ViewletManager):
    … …  
    7474    """
    7575    grok.baseclass()
    76     grok.context(IWAeUPObject)
     76    grok.context(ISIRPObject)
    7777    grok.viewletmanager(ActionBar)
    7878    icon = 'actionicon_modify.png' # File must exist in static/
    … …  
    185185
    186186class BreadCrumbs(grok.Viewlet):
    187     grok.context(IWAeUPObject)
     187    grok.context(ISIRPObject)
    188188    grok.viewletmanager(BreadCrumbManager)
    189189    grok.order(1)
    … …  
    227227    grok.baseclass()
    228228    grok.viewletmanager(LeftSidebar)
    229     grok.context(IWAeUPObject)
     229    grok.context(ISIRPObject)
    230230    grok.order(5)
    231231    grok.require('waeup.manageUniversity')
    … …  
    279279    """
    280280    grok.viewletmanager(LeftSidebar)
    281     grok.context(IWAeUPObject)
     281    grok.context(ISIRPObject)
    282282    grok.view(Interface)
    283283    grok.order(2)
    … …  
    313313    """
    314314    grok.viewletmanager(LeftSidebar)
    315     grok.context(IWAeUPObject)
     315    grok.context(ISIRPObject)
    316316    grok.view(Interface)
    317317    grok.order(5)
    … …  
    519519class BrowseActionButton(ActionButton):
    520520    grok.baseclass()
    521     grok.context(IWAeUPObject)
     521    grok.context(ISIRPObject)
    522522    grok.template('actionbutton')
    523523    grok.viewletmanager(ActionBar)

  • main/waeup.sirp/trunk/src/waeup/sirp/catalog.py

    r7193 r7321  
    3131
    3232# not yet used
    33 class WAeUPQuery(Query):
     33class SIRPQuery(Query):
    3434    """A hurry.query-like query that supports also ``apply``.
    3535    """
    … …  
    5050        return results
    5151
    52 grok.global_utility(WAeUPQuery)
     52grok.global_utility(SIRPQuery)
    5353
    5454# not yet used

  • main/waeup.sirp/trunk/src/waeup/sirp/catalog.txt

    r5140 r7321  
    1 :mod:`waeup.sirp.catalog` -- Cataloging support for WAeUP SIRP
    2 **************************************************************
     1:mod:`waeup.sirp.catalog` -- Cataloging support SIRP
     2****************************************************
    33
    44.. module:: waeup.sirp.catalog
    55
    66Components that support cataloging and searching objects inside a
    7 WAeUP SIRP site.
     7SIRP site.
    88
    99.. :doctest:
    10 .. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
     10.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
    1111
    1212.. contents::
    … …  
    1515=======
    1616
    17 :class:`WAeUPQuery`
    18 -------------------
    19 
    20 .. class:: WAeUPQuery()
     17:class:`SIRPQuery`
     18------------------
     19
     20.. class:: SIRPQuery()
    2121
    2222   .. attribute:: grok.implements(hurry.query.interfaces.IQuery)
    … …  
    2525   retrival of plain ``Bree`` result sets as used inside a catalog.
    2626
    27    Like `hurry.query.query.Query` objects, `WAeUPQuery` is some kind
     27   Like `hurry.query.query.Query` objects, `SIRPQuery` is some kind
    2828   of a meta query or 'compound query' that can give the cataloged
    2929   objects (or their int ids) matching one or more 'subqueries'.
    … …  
    5555------------------------------
    5656
    57 We can get a WAeUPQuery object by asking for an unnamed global utility
     57We can get a SIRPQuery object by asking for an unnamed global utility
    5858implementing `hurry.query.interfaces.IQuery`:
    5959
    … …  
    6262    >>> q = getUtility(IQuery)
    6363    >>> q
    64     <waeup.sirp.catalog.WAeUPQuery object at 0x...>
     64    <waeup.sirp.catalog.SIRPQuery object at 0x...>
    6565
    6666This query can get 'subqueries' and delivers the objects found or
    … …  
    101101
    102102We also setup a `zope.intid.interfaces.IIntIds` utility. This is not
    103 necessary for plain catalogs, but when we want to use WAeUPQuery (or
     103necessary for plain catalogs, but when we want to use SIRPQuery (or
    104104`hurry.query.query.Query` objects), as to get a unique mapping from
    105105objects (stored in ZODB) to integer numbers (stored in catalogs),
    … …  
    204204
    205205This can be done by using the ``searchResults`` method of
    206 ``WAeUPQuery``:
     206``SIRPQuery``:
    207207
    208208    >>> r2 = q.searchResults(subquery1)

  • main/waeup.sirp/trunk/src/waeup/sirp/datacenter.py

    r7193 r7321  
    1616## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1717##
    18 """WAeUP data center.
     18"""SIRP data center.
    1919
    2020The waeup data center cares for management of upload data and provides

  • main/waeup.sirp/trunk/src/waeup/sirp/datacenter.txt

    r5140 r7321  
    1 WAeUP Data Center
    2 *****************
    3 
    4 The WAeUP data center cares for managing CSV files and importing then.
     1SIRP Data Center
     2****************
     3
     4The SIRP data center cares for managing CSV files and importing then.
    55
    66.. :doctest:
    7 .. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
     7.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
    88
    99Creating a data center

  • main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser.py

    r7257 r7321  
    2121import sys
    2222from waeup.sirp.browser import (
    23     WAeUPEditFormPage, WAeUPAddFormPage, WAeUPDisplayFormPage,
     23    SIRPEditFormPage, SIRPAddFormPage, SIRPDisplayFormPage,
    2424    NullValidator)
    2525from waeup.sirp.browser.breadcrumbs import Breadcrumb
    … …  
    2929from waeup.sirp.browser.viewlets import (
    3030    ManageActionButton, PrimaryNavTab)
    31 from waeup.sirp.interfaces import IWAeUPObject
     31from waeup.sirp.interfaces import ISIRPObject
    3232from waeup.sirp.hostels.vocabularies import NOT_OCCUPIED
    3333from waeup.sirp.hostels.hostel import Hostel
    … …  
    5757    """
    5858
    59     grok.context(IWAeUPObject)
     59    grok.context(ISIRPObject)
    6060    grok.order(5)
    6161    grok.require('waeup.viewHostels')
    … …  
    9191        return 'Block %s, Room %s, Bed %s' % (co[1], co[2], co[3])
    9292
    93 class HostelsContainerPage(WAeUPDisplayFormPage):
     93class HostelsContainerPage(SIRPDisplayFormPage):
    9494    """The standard view for hostels containers.
    9595    """
    … …  
    109109    text = 'Manage accommodation section'
    110110
    111 class HostelsContainerManagePage(WAeUPDisplayFormPage):
     111class HostelsContainerManagePage(SIRPDisplayFormPage):
    112112    """The manage page for hostel containers.
    113113    """
    … …  
    141141        return
    142142
    143 class HostelAddFormPage(WAeUPAddFormPage):
     143class HostelAddFormPage(SIRPAddFormPage):
    144144    """Add-form to add a hostel.
    145145    """
    … …  
    169169        return
    170170
    171 class HostelDisplayFormPage(WAeUPDisplayFormPage):
     171class HostelDisplayFormPage(SIRPDisplayFormPage):
    172172    """ Page to display hostel data
    173173    """
    … …  
    194194    target = 'manage'
    195195
    196 class HostelManageFormPage(WAeUPEditFormPage):
     196class HostelManageFormPage(SIRPEditFormPage):
    197197    """ View to edit hostel data
    198198    """
    … …  
    294294        return
    295295
    296 class BedManageFormPage(WAeUPEditFormPage):
     296class BedManageFormPage(SIRPEditFormPage):
    297297    """ View to edit bed data
    298298    """

  • main/waeup.sirp/trunk/src/waeup/sirp/hostels/interfaces.py

    r7257 r7321  
    1818from zope.interface import invariant, Invalid
    1919from zope import schema
    20 from waeup.sirp.interfaces import IWAeUPObject
     20from waeup.sirp.interfaces import ISIRPObject
    2121from waeup.sirp.hostels.vocabularies import (
    2222    bed_letters, blocks, special_handling, StudentSource)
    2323
    24 class IHostelsContainer(IWAeUPObject):
     24class IHostelsContainer(ISIRPObject):
    2525    """A container for all kind of hostel objects.
    2626
    2727    """
    2828
    29 class IHostel(IWAeUPObject):
     29class IHostel(ISIRPObject):
    3030    """A base representation of hostels.
    3131
    … …  
    145145            raise Invalid('Bed categories overlap.')
    146146
    147 class IBed(IWAeUPObject):
     147class IBed(ISIRPObject):
    148148    """A base representation of beds.
    149149

  • main/waeup.sirp/trunk/src/waeup/sirp/hostels/vocabularies.py

    r7257 r7321  
    2222from zope.catalog.interfaces import ICatalog
    2323from zc.sourcefactory.contextual import BasicContextualSourceFactory
    24 from waeup.sirp.interfaces import SimpleWAeUPVocabulary
     24from waeup.sirp.interfaces import SimpleSIRPVocabulary
    2525
    2626NOT_OCCUPIED = u'not occupied'
    … …  
    5353        return "%s - %s" % (value, self.acco_students(context)[value])
    5454
    55 bed_letters = SimpleWAeUPVocabulary(
     55bed_letters = SimpleSIRPVocabulary(
    5656    ('Bed A','A'),
    5757    ('Bed B','B'),
    … …  
    6565    )
    6666
    67 blocks = SimpleWAeUPVocabulary(
     67blocks = SimpleSIRPVocabulary(
    6868    ('Block A','A'),
    6969    ('Block B','B'),
    … …  
    8383    )
    8484
    85 special_handling = SimpleWAeUPVocabulary(
     85special_handling = SimpleSIRPVocabulary(
    8686    ('Regular Hostel','regular'),
    8787    ('Blocked Hostel','blocked'),

  • main/waeup.sirp/trunk/src/waeup/sirp/image/README.txt

    r6584 r7321  
    22========================================
    33
    4 The image file widget is built on top of the :class:`WAeUPImageFile` object::
    5 
    6   >>> from waeup.sirp.image import WAeUPImageFile
    7   >>> file = WAeUPImageFile('foo.jpg', 'mydata')
     4The image file widget is built on top of the :class:`SIRPImageFile` object::
     5
     6  >>> from waeup.sirp.image import SIRPImageFile
     7  >>> file = SIRPImageFile('foo.jpg', 'mydata')
    88  >>> file.filename
    99  'foo.jpg'
    … …  
    1616  'mydata'
    1717
    18 We can also create WAeUPImageFile objects from file-like objects::
     18We can also create SIRPImageFile objects from file-like objects::
    1919
    2020  >>> from StringIO import StringIO
    … …  
    3636----------------
    3737
    38 The WAeUPImageFile object normally stores the file data using ZODB
     38The SIRPImageFile object normally stores the file data using ZODB
    3939persistence. Files can however also be stored by tramline.  If
    4040tramline is installed in Apache, the Tramline takes care of generating
    … …  
    7373just '1') will now be created::
    7474
    75   >>> file = WAeUPImageFile('foo.jpg', '1')
     75  >>> file = SIRPImageFile('foo.jpg', '1')
    7676
    7777The data is now '1', referring to the real file::
    … …  
    102102We expect the same behavior as when tramline is not installed::
    103103
    104   >>> file = WAeUPImageFile('foo.jpg', 'data')
     104  >>> file = SIRPImageFile('foo.jpg', 'data')
    105105  >>> f = file.file
    106106  >>> f.read()
    … …  
    141141  Traceback (most recent call last):
    142142  ...
    143   WrongType: ('asd', <class 'waeup.sirp.image.image.WAeUPImageFile'>, 'foo')
     143  WrongType: ('asd', <class 'waeup.sirp.image.image.SIRPImageFile'>, 'foo')
    144144
    145145which means: `ImageFile` fields should better contain
    146 :class:`WAeUPImageFile` instances.
    147 
    148 We can store normal :class:`WAeUPImageFile` instances:
    149 
    150   >>> field.validate(WAeUPImageFile('bar.jpg', 'data')) is None
     146:class:`SIRPImageFile` instances.
     147
     148We can store normal :class:`SIRPImageFile` instances:
     149
     150  >>> field.validate(SIRPImageFile('bar.jpg', 'data')) is None
    151151  True
    152152
    … …  
    173173
    174174  >>> field.validate(
    175   ...     WAeUPImageFile('bar.jpg', '123456789012')) is None
    176   True
    177 
    178   >>> field.validate(
    179   ...     WAeUPImageFile('bar.jpg', '12345')) is None
     175  ...     SIRPImageFile('bar.jpg', '123456789012')) is None
     176  True
     177
     178  >>> field.validate(
     179  ...     SIRPImageFile('bar.jpg', '12345')) is None
    180180  True
    181181
    … …  
    183183
    184184  >>> field.validate(
    185   ...     WAeUPImageFile('bar.jpg', '1234567890123'))
     185  ...     SIRPImageFile('bar.jpg', '1234567890123'))
    186186  Traceback (most recent call last):
    187187  ...
    … …  
    189189
    190190  >>> field.validate(
    191   ...     WAeUPImageFile('bar.jpg', '1234'))
     191  ...     SIRPImageFile('bar.jpg', '1234'))
    192192  Traceback (most recent call last):
    193193  ...
    … …  
    198198----------------------------
    199199
    200 WAeUPImageFile does not reproduce the broken unequal comparison from
     200SIRPImageFile does not reproduce the broken unequal comparison from
    201201its base:
    202202
    203   >>> f1 = WAeUPImageFile('bar.jpg', '123456789')
    204   >>> f2 = WAeUPImageFile('bar.jpg', '123456789')
    205   >>> f3 = WAeUPImageFile('baz.jpg', '1234')
     203  >>> f1 = SIRPImageFile('bar.jpg', '123456789')
     204  >>> f2 = SIRPImageFile('bar.jpg', '123456789')
     205  >>> f3 = SIRPImageFile('baz.jpg', '1234')
    206206  >>> f1 == f2
    207207  True

  • main/waeup.sirp/trunk/src/waeup/sirp/image/__init__.py

    r7137 r7321  
    33Includings schemas, widgets and the content components.
    44"""
    5 from waeup.sirp.image.image import WAeUPImageFile, createWAeUPImageFile
     5from waeup.sirp.image.image import SIRPImageFile, createSIRPImageFile
    66
    77__all__ = [
    8     "WAeUPImageFile",
    9     "createWAeUPImageFile",
     8    "SIRPImageFile",
     9    "createSIRPImageFile",
    1010    ]

  • main/waeup.sirp/trunk/src/waeup/sirp/image/browser/tests/image.txt

    r6537 r7321  
    1212
    1313  >>> import os
    14   >>> from waeup.sirp.image import WAeUPImageFile
     14  >>> from waeup.sirp.image import SIRPImageFile
    1515  >>> testimage = os.path.join(os.path.dirname(__file__), 'sample.jpg')
    1616  >>> testimage2 = os.path.join(os.path.dirname(__file__), 'sample2.jpg')
    17   >>> some_file = WAeUPImageFile('foo.jpg', open(testimage, 'rb').read())
     17  >>> some_file = SIRPImageFile('foo.jpg', open(testimage, 'rb').read())
    1818  >>> some_file.filename
    1919  'foo.jpg'
    … …  
    166166prepare some new file:
    167167
    168   >>> another_file = WAeUPImageFile('bar.txt', 'bar contents')
     168  >>> another_file = SIRPImageFile('bar.txt', 'bar contents')
    169169
    170170We happen to know, due to the implementation of
    … …  
    200200---------------------------
    201201
    202 As :class:`waeup.sirp.image.WAeUPImageFile` objects support storing
     202As :class:`waeup.sirp.image.SIRPImageFile` objects support storing
    203203image data by using external 'storages', also our widgets should do
    204204so.
    … …  
    220220  ...         contents = f.read()
    221221  ...         id_string = hashlib.md5(contents).hexdigest()
    222   ...         result = WAeUPImageFile(filename, id_string)
     222  ...         result = SIRPImageFile(filename, id_string)
    223223  ...         self.storage[id_string] = contents
    224224  ...         return result
    … …  
    260260We now want to simulate, that the field contains already data,
    261261identified by some `file_id`. To do so, we first store the data in our
    262 file retrieval and then create a WAeUPImageFile object with that
     262file retrieval and then create a SIRPImageFile object with that
    263263file_id stored:
    264264
    265   >>> from waeup.sirp.image import createWAeUPImageFile
    266   >>> image = createWAeUPImageFile(
     265  >>> from waeup.sirp.image import createSIRPImageFile
     266  >>> image = createSIRPImageFile(
    267267  ...     'sample.jpg', open(testimage, 'rb'))
    268268  >>> file_id = image.data
    … …  
    274274  '9feac4265077922000aa8b88748e25be'
    275275
    276 The new file was stored by our utility, as createWAeUPImageFile looks
     276The new file was stored by our utility, as createSIRPImageFile looks
    277277up IFileRetrieval utilities and uses them:
    278278

  • main/waeup.sirp/trunk/src/waeup/sirp/image/browser/widget.py

    r7196 r7321  
    1919"""
    2020import os
    21 from waeup.sirp.image import WAeUPImageFile
     21from waeup.sirp.image import SIRPImageFile
    2222from hurry.file.browser.widget import (
    2323    EncodingFileWidget, DownloadWidget, FakeFieldStorage)
    … …  
    6262                seek(0)
    6363                return retrieval.createFile(input.filename, input)
    64             return WAeUPImageFile(input.filename, data)
     64            return SIRPImageFile(input.filename, data)
    6565        else:
    6666            return self.context.missing_value
    … …  
    143143        data = file_id.decode('base64')
    144144        filename, filedata = data.split('\n', 1)
    145         return WAeUPImageFile(filename, filedata)
     145        return SIRPImageFile(filename, filedata)
    146146
    147147class ThumbnailWidget(DownloadWidget):

  • main/waeup.sirp/trunk/src/waeup/sirp/image/image.py

    r7196 r7321  
    2323from zope.component import getUtility
    2424from zope.interface import implements
    25 from waeup.sirp.image.interfaces import IWAeUPImageFile
     25from waeup.sirp.image.interfaces import ISIRPImageFile
    2626
    27 class WAeUPImageFile(HurryFile):
     27class SIRPImageFile(HurryFile):
    2828    """A file prepared for storing image files.
    2929
    … …  
    3232    regular hurry files.
    3333
    34     To create a :class:`WAeUPImageFile` you should use
    35     :func:`createWAeUPImageFile`.
     34    To create a :class:`SIRPImageFile` you should use
     35    :func:`createSIRPImageFile`.
    3636    """
    37     implements(IWAeUPImageFile)
     37    implements(ISIRPImageFile)
    3838
    3939    def __ne__(self, other):
    … …  
    4545            return True
    4646
    47 def createWAeUPImageFile(filename, f):
     47def createSIRPImageFile(filename, f):
    4848    retrieval = getUtility(IFileRetrieval)
    4949    return retrieval.createFile(filename, f)

  • main/waeup.sirp/trunk/src/waeup/sirp/image/interfaces.py

    r7196 r7321  
    2424    """
    2525   
    26 class IWAeUPImageFile(IHurryFile):
     26class ISIRPImageFile(IHurryFile):
    2727    """Image file.
    2828    """

  • main/waeup.sirp/trunk/src/waeup/sirp/image/schema.py

    r7196 r7321  
    2323from hurry.file.schema import File
    2424from waeup.sirp.image.interfaces import IImageFile
    25 from waeup.sirp.image.image import WAeUPImageFile
     25from waeup.sirp.image.image import SIRPImageFile
    2626
    2727class MinMaxSize(object):
    … …  
    8282    implements(IImageFile)
    8383
    84     _type = WAeUPImageFile
     84    _type = SIRPImageFile

  • main/waeup.sirp/trunk/src/waeup/sirp/interfaces.py

    r7313 r7321  
    4444        os.path.dirname(__file__), 'frontpage.rst'), 'rb').read()
    4545
    46 def SimpleWAeUPVocabulary(*terms):
     46def SimpleSIRPVocabulary(*terms):
    4747    """A well-buildt vocabulary provides terms with a value, token and
    4848       title for each term
    … …  
    6060    return [('%s/%s' % (year,year+1), year) for year in year_range]
    6161
    62 academic_sessions_vocab = SimpleWAeUPVocabulary(*academic_sessions())
    63 
    64 registration_states_vocab = SimpleWAeUPVocabulary(
     62academic_sessions_vocab = SimpleSIRPVocabulary(*academic_sessions())
     63
     64registration_states_vocab = SimpleSIRPVocabulary(
    6565    ('created', CREATED),
    6666    ('admitted', ADMITTED),
    … …  
    140140        return value
    141141
    142 class IWAeUPObject(Interface):
    143     """A WAeUP object.
     142class ISIRPObject(Interface):
     143    """A SIRP object.
    144144
    145145    This is merely a marker interface.
    146146    """
    147147
    148 class IUniversity(IWAeUPObject):
     148class IUniversity(ISIRPObject):
    149149    """Representation of a university.
    150150    """
    151151
    152152
    153 class IWAeUPContainer(IWAeUPObject):
    154     """A container for WAeUP objects.
    155     """
    156 
    157 class IWAeUPContained(IWAeUPObject):
    158     """An item contained in an IWAeUPContainer.
    159     """
    160 
    161 class IWAeUPExporter(Interface):
     153class ISIRPContainer(ISIRPObject):
     154    """A container for SIRP objects.
     155    """
     156
     157class ISIRPContained(ISIRPObject):
     158    """An item contained in an ISIRPContainer.
     159    """
     160
     161class ISIRPExporter(Interface):
    162162    """An exporter for objects.
    163163    """
    … …  
    171171        """
    172172
    173 class IWAeUPXMLExporter(Interface):
     173class ISIRPXMLExporter(Interface):
    174174    """An XML exporter for objects.
    175175    """
    … …  
    183183        """
    184184
    185 class IWAeUPXMLImporter(Interface):
     185class ISIRPXMLImporter(Interface):
    186186    """An XML import for objects.
    187187    """
    … …  
    220220        """
    221221
    222 class IContactForm(IWAeUPObject):
     222class IContactForm(ISIRPObject):
    223223    """A contact form.
    224224    """
    … …  
    251251
    252252class ISIRPPrincipalInfo(IPrincipalInfo):
    253     """Infos about principals that are users of WAeUP SIRP.
     253    """Infos about principals that are users of SIRP SIRP.
    254254    """
    255255    email = Attribute("The email address of a user")
    … …  
    258258
    259259class ISIRPPrincipal(IPrincipal):
    260     """A principle for WAeUP SIRP.
     260    """A principle for SIRP SIRP.
    261261
    262262    This interface extends zope.security.interfaces.IPrincipal and
    … …  
    274274        required=False,)
    275275
    276 class IUserAccount(IWAeUPObject):
     276class IUserAccount(ISIRPObject):
    277277    """A user account.
    278278    """
    … …  
    318318
    319319
    320 class IUsersContainer(IWAeUPObject):
     320class IUsersContainer(ISIRPObject):
    321321    """A container for users (principals).
    322322
    … …  
    343343        """
    344344
    345 class IConfigurationContainer(IWAeUPObject):
     345class IConfigurationContainer(ISIRPObject):
    346346    """A container for session configuration objects.
    347347    """
    … …  
    438438        )
    439439
    440 class ISessionConfiguration(IWAeUPObject):
     440class ISessionConfiguration(ISIRPObject):
    441441    """A session configuration object.
    442442    """
    … …  
    505505    'academic_session'].order
    506506
    507 class IDataCenter(IWAeUPObject):
     507class IDataCenter(ISIRPObject):
    508508    """A data center.
    509509
    … …  
    568568        title = u'Longer description of the item found.')
    569569
    570 class IWAeUPSIRPPluggable(Interface):
    571     """A component that might be plugged into a WAeUP SIRP app.
     570class ISIRPPluggable(Interface):
     571    """A component that might be plugged into a SIRP SIRP app.
    572572
    573573    Components implementing this interface are referred to as
    … …  
    706706        """
    707707
    708 class IWAeUPWorkflowInfo(IWorkflowInfo):
     708class ISIRPWorkflowInfo(IWorkflowInfo):
    709709    """A :class:`hurry.workflow.workflow.WorkflowInfo` with additional
    710710       methods for convenience.
    … …  
    719719class ISiteLoggers(Interface):
    720720
    721     loggers = Attribute("A list or generator of registered WAeUPLoggers")
     721    loggers = Attribute("A list or generator of registered SIRPLoggers")
    722722
    723723    def register(name, filename=None, site=None, **options):
    … …  
    740740
    741741    def __init__(name, filename=None, site=None, **options):
    742         """Create a WAeUP logger instance.
     742        """Create a SIRP logger instance.
    743743        """
    744744
    … …  
    872872
    873873        Returns a tuple ``(raw_file, path, file_like_obj)`` where the
    874         ``file_like_obj`` should be a HurryFile, a WAeUPImageFile or
     874        ``file_like_obj`` should be a HurryFile, a SIRPImageFile or
    875875        similar. ``raw_file`` is the (maybe changed) input file and
    876876        ``path`` the relative internal path to store the file at.

  • main/waeup.sirp/trunk/src/waeup/sirp/meta.py

    r7193 r7321  
    1616## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1717##
    18 """Grokkers for WAeUP components.
     18"""Grokkers for SIRP components.
    1919
    2020Stuff in here is mainly taken from grok.meta, with some modifications
    … …  
    6161            return False
    6262
    63         subscriber = WAeUPIndexesUpgradeSubscriber(
     63        subscriber = SIRPIndexesUpgradeSubscriber(
    6464            catalog_name, indexes, context, module_info)
    6565        subscribed = (site, IObjectUpgradeEvent)
    … …  
    7272
    7373
    74 class WAeUPIndexesUpgradeSubscriber(IndexesSetupSubscriber):
     74class SIRPIndexesUpgradeSubscriber(IndexesSetupSubscriber):
    7575    """Helper that sets up indexes when their Grok site is upgraded.
    7676

  • main/waeup.sirp/trunk/src/waeup/sirp/objecthistory.py

    r7193 r7321  
    2020from persistent.list import PersistentList
    2121from zope.annotation.interfaces import IAnnotations
    22 from waeup.sirp.interfaces import IObjectHistory, IWAeUPObject
     22from waeup.sirp.interfaces import IObjectHistory, ISIRPObject
    2323from waeup.sirp.utils.helpers import get_current_principal
    2424
    … …  
    2626    """A history for objects.
    2727
    28     For any object implementing `IWAeUPObject` which is annotatable,
     28    For any object implementing `ISIRPObject` which is annotatable,
    2929    we provide histories. A history for such an object can be obtained
    3030    by adapting it to `IObjectHistory`.
    3131    """
    32     grok.context(IWAeUPObject)
     32    grok.context(ISIRPObject)
    3333    grok.implements(IObjectHistory)
    3434

  • main/waeup.sirp/trunk/src/waeup/sirp/payments/interfaces.py

    r7195 r7321  
    1818from zope.interface import Attribute
    1919from zope import schema
    20 from waeup.sirp.interfaces import IWAeUPObject
     20from waeup.sirp.interfaces import ISIRPObject
    2121from waeup.sirp.payments.vocabularies import (
    2222    payment_states, payment_categories)
    2323
    24 class IPaymentsContainer(IWAeUPObject):
     24class IPaymentsContainer(ISIRPObject):
    2525    """A container for all kind of payment objects.
    2626
    2727    """
    2828
    29 class IPayment(IWAeUPObject):
     29class IPayment(ISIRPObject):
    3030    """A base representation of payments.
    3131

  • main/waeup.sirp/trunk/src/waeup/sirp/payments/vocabularies.py

    r7250 r7321  
    1818"""Vocabularies and sources for payments.
    1919"""
    20 from waeup.sirp.interfaces import SimpleWAeUPVocabulary
     20from waeup.sirp.interfaces import SimpleSIRPVocabulary
    2121
    22 payment_states = SimpleWAeUPVocabulary(
     22payment_states = SimpleSIRPVocabulary(
    2323    ('Not yet paid','unpaid'),
    2424    ('Paid','paid'),
    2525    )
    2626
    27 payment_categories = SimpleWAeUPVocabulary(
     27payment_categories = SimpleSIRPVocabulary(
    2828    ('School Fee','schoolfee'),
    2929    ('Clearance','clearance'),

  • main/waeup.sirp/trunk/src/waeup/sirp/permissions.py

    r7250 r7321  
    128128
    129129def get_waeup_roles(also_local=False):
    130     """Get all WAeUP roles.
    131 
    132     WAeUP roles are ordinary roles whose id by convention starts with
     130    """Get all SIRP roles.
     131
     132    SIRP roles are ordinary roles whose id by convention starts with
    133133    a ``waeup.`` prefix.
    134134
    135135    If `also_local` is ``True`` (``False`` by default), also local
    136     roles are returned. Local WAeUP roles are such whose id starts
     136    roles are returned. Local SIRP roles are such whose id starts
    137137    with ``waeup.local.`` prefix (this is also a convention).
    138138
    … …  
    141141    for name, item in get_all_roles():
    142142        if not name.startswith('waeup.'):
    143             # Ignore non-WAeUP roles...
     143            # Ignore non-SIRP roles...
    144144            continue
    145145        if not also_local and name.startswith('waeup.local.'):
    … …  
    149149
    150150def get_waeup_role_names():
    151     """Get the ids of all WAeUP roles.
    152 
    153     See :func:`get_waeup_roles` for what a 'WAeUPRole' is.
    154 
    155     This function returns a sorted list of WAeUP role names.
     151    """Get the ids of all SIRP roles.
     152
     153    See :func:`get_waeup_roles` for what a 'SIRPRole' is.
     154
     155    This function returns a sorted list of SIRP role names.
    156156    """
    157157    return sorted([x.id for x in get_waeup_roles()])

  • main/waeup.sirp/trunk/src/waeup/sirp/permissions.txt

    r7186 r7321  
    1 WAeUP permissions and roles
    2 ***************************
     1SIRP permissions and roles
     2**************************
    33
    4 Permissions and roles used in a WAeUP portal.
     4Permissions and roles used in a SIRP portal.
    55
    66.. :doctest:
    7 .. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
     7.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
    88
    99Convenience functions
    … …  
    1616---------------------
    1717
    18 Gives us all roles defined in a WAeUP SIRP portal. We get tuples of
     18Gives us all roles defined in SIRP. We get tuples of
    1919kind
    2020
    … …  
    3434-----------------------
    3535
    36 Gives us all roles, except the WAeUP specific roles. We can get a list
     36Gives us all roles, except the SIRP specific roles. We can get a list
    3737with or without local roles:
    3838
    … …  
    4848----------------------------
    4949
    50 We can get all role names defined in a WAeUP portal (except 'local'
     50We can get all role names defined in SIRP (except 'local'
    5151roles that are meant not to be assigned globally):
    5252

  • main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py

    r7318 r7321  
    3232from waeup.sirp.accesscodes.workflow import USED
    3333from waeup.sirp.browser import (
    34     WAeUPPage, WAeUPEditFormPage, WAeUPAddFormPage, WAeUPDisplayFormPage,
     34    SIRPPage, SIRPEditFormPage, SIRPAddFormPage, SIRPDisplayFormPage,
    3535    ContactAdminForm)
    3636from waeup.sirp.browser.breadcrumbs import Breadcrumb
    … …  
    3939    ManageActionButton, AddActionButton)
    4040from waeup.sirp.interfaces import (
    41     IWAeUPObject, IUserAccount, IExtFileStore, IPasswordValidator, IContactForm)
     41    ISIRPObject, IUserAccount, IExtFileStore, IPasswordValidator, IContactForm)
    4242from waeup.sirp.widgets.datewidget import (
    4343    FriendlyDateWidget, FriendlyDateDisplayWidget,
    … …  
    155155        return self.context.level_title
    156156
    157 class StudentsContainerPage(WAeUPPage):
     157class StudentsContainerPage(SIRPPage):
    158158    """The standard view for student containers.
    159159    """
    … …  
    188188        return
    189189
    190 class SetPasswordPage(WAeUPPage):
    191     grok.context(IWAeUPObject)
     190class SetPasswordPage(SIRPPage):
     191    grok.context(ISIRPObject)
    192192    grok.name('setpassword')
    193193    grok.require('waeup.Public')
    … …  
    253253
    254254
    255 class StudentsContainerManagePage(WAeUPPage):
     255class StudentsContainerManagePage(SIRPPage):
    256256    """The manage page for student containers.
    257257    """
    … …  
    310310    target = 'addstudent'
    311311
    312 class StudentAddFormPage(WAeUPAddFormPage):
     312class StudentAddFormPage(SIRPAddFormPage):
    313313    """Add-form to add a student.
    314314    """
    … …  
    331331        return
    332332
    333 class StudentBaseDisplayFormPage(WAeUPDisplayFormPage):
     333class StudentBaseDisplayFormPage(SIRPDisplayFormPage):
    334334    """ Page to display student base data
    335335    """
    … …  
    406406    target = 'manage_base'
    407407
    408 class StudentBaseManageFormPage(WAeUPEditFormPage):
     408class StudentBaseManageFormPage(SIRPEditFormPage):
    409409    """ View to manage student base data
    410410    """
    … …  
    467467        return
    468468
    469 class StudentClearanceDisplayFormPage(WAeUPDisplayFormPage):
     469class StudentClearanceDisplayFormPage(SIRPDisplayFormPage):
    470470    """ Page to display student clearance data
    471471    """
    … …  
    552552            self.context.getStudent(), studentview)
    553553
    554 class StudentClearanceManageFormPage(WAeUPEditFormPage):
     554class StudentClearanceManageFormPage(SIRPEditFormPage):
    555555    """ Page to edit student clearance data
    556556    """
    … …  
    622622        return
    623623
    624 class StudentPersonalDisplayFormPage(WAeUPDisplayFormPage):
     624class StudentPersonalDisplayFormPage(SIRPDisplayFormPage):
    625625    """ Page to display student personal data
    626626    """
    … …  
    644644    target = 'edit_personal'
    645645
    646 class StudentPersonalManageFormPage(WAeUPEditFormPage):
     646class StudentPersonalManageFormPage(SIRPEditFormPage):
    647647    """ Page to edit student clearance data
    648648    """
    … …  
    660660        return
    661661
    662 class StudyCourseDisplayFormPage(WAeUPDisplayFormPage):
     662class StudyCourseDisplayFormPage(SIRPDisplayFormPage):
    663663    """ Page to display the student study course data
    664664    """
    … …  
    703703    target = 'manage'
    704704
    705 class StudyCourseManageFormPage(WAeUPEditFormPage):
     705class StudyCourseManageFormPage(SIRPEditFormPage):
    706706    """ Page to edit the student study course data
    707707    """
    … …  
    773773        return
    774774
    775 class StudyLevelDisplayFormPage(WAeUPDisplayFormPage):
     775class StudyLevelDisplayFormPage(SIRPDisplayFormPage):
    776776    """ Page to display student study levels
    777777    """
    … …  
    854854    target = 'manage'
    855855
    856 class StudyLevelManageFormPage(WAeUPEditFormPage):
     856class StudyLevelManageFormPage(SIRPEditFormPage):
    857857    """ Page to edit the student study level data
    858858    """
    … …  
    913913        return
    914914
    915 class CourseTicketAddFormPage(WAeUPAddFormPage):
     915class CourseTicketAddFormPage(SIRPAddFormPage):
    916916    """Add a course ticket.
    917917    """
    … …  
    956956        self.redirect(self.url(self.context))
    957957
    958 class CourseTicketDisplayFormPage(WAeUPDisplayFormPage):
     958class CourseTicketDisplayFormPage(SIRPDisplayFormPage):
    959959    """ Page to display course tickets
    960960    """
    … …  
    983983    target = 'manage'
    984984
    985 class CourseTicketManageFormPage(WAeUPEditFormPage):
     985class CourseTicketManageFormPage(SIRPEditFormPage):
    986986    """ Page to manage course tickets
    987987    """
    … …  
    10071007
    10081008# We don't need the display form page yet
    1009 #class PaymentsDisplayFormPage(WAeUPDisplayFormPage):
     1009#class PaymentsDisplayFormPage(SIRPDisplayFormPage):
    10101010#    """ Page to display the student payments
    10111011#    """
    … …  
    10281028
    10291029# This manage form page is for both students and students officers.
    1030 class PaymentsManageFormPage(WAeUPEditFormPage):
     1030class PaymentsManageFormPage(SIRPEditFormPage):
    10311031    """ Page to manage the student payments
    10321032    """
    … …  
    10931093#    target = 'manage'
    10941094
    1095 class OnlinePaymentAddFormPage(WAeUPAddFormPage):
     1095class OnlinePaymentAddFormPage(SIRPAddFormPage):
    10961096    """ Page to add an online payment ticket
    10971097    """
    … …  
    11521152        return
    11531153
    1154 class OnlinePaymentDisplayFormPage(WAeUPDisplayFormPage):
     1154class OnlinePaymentDisplayFormPage(SIRPDisplayFormPage):
    11551155    """ Page to view an online payment ticket
    11561156    """
    … …  
    12791279
    12801280# We don't need the display form page yet
    1281 #class AccommodationDisplayFormPage(WAeUPDisplayFormPage):
     1281#class AccommodationDisplayFormPage(SIRPDisplayFormPage):
    12821282#    """ Page to display the student accommodation data
    12831283#    """
    … …  
    12951295
    12961296# This manage form page is for both students and students officers.
    1297 class AccommodationManageFormPage(WAeUPEditFormPage):
     1297class AccommodationManageFormPage(SIRPEditFormPage):
    12981298    """ Page to manage bed tickets.
    12991299    """
    … …  
    13581358    target = 'add'
    13591359
    1360 class BedTicketAddPage(WAeUPPage):
     1360class BedTicketAddPage(SIRPPage):
    13611361    """ Page to add an online payment ticket
    13621362    """
    … …  
    14491449        return
    14501450
    1451 class BedTicketDisplayFormPage(WAeUPDisplayFormPage):
     1451class BedTicketDisplayFormPage(SIRPDisplayFormPage):
    14521452    """ Page to display bed tickets
    14531453    """
    … …  
    15761576        return
    15771577
    1578 class StudentHistoryPage(WAeUPPage):
     1578class StudentHistoryPage(SIRPPage):
    15791579    """ Page to display student clearance data
    15801580    """
    … …  
    16241624        return self.view.url(self.view.context, self.target)
    16251625
    1626 class StudentBaseEditFormPage(WAeUPEditFormPage):
     1626class StudentBaseEditFormPage(SIRPEditFormPage):
    16271627    """ View to edit student base data
    16281628    """
    … …  
    16411641        return
    16421642
    1643 class StudentChangePasswordPage(WAeUPEditFormPage):
     1643class StudentChangePasswordPage(SIRPEditFormPage):
    16441644    """ View to manage student base data
    16451645    """
    … …  
    16681668        return
    16691669
    1670 class StudentFilesUploadPage(WAeUPPage):
     1670class StudentFilesUploadPage(SIRPPage):
    16711671    """ View to upload files by student
    16721672    """
    … …  
    17011701        return self.view.url(self.view.context, self.target)
    17021702
    1703 class StartClearancePage(WAeUPPage):
     1703class StartClearancePage(SIRPPage):
    17041704    grok.context(IStudent)
    17051705    grok.name('start_clearance')
    … …  
    18231823        return
    18241824
    1825 class RequestClearancePage(WAeUPPage):
     1825class RequestClearancePage(SIRPPage):
    18261826    grok.context(IStudent)
    18271827    grok.name('request_clearance')
    … …  
    18701870        return self.view.url(self.view.context, self.target)
    18711871
    1872 class StartCourseRegistrationPage(WAeUPPage):
     1872class StartCourseRegistrationPage(SIRPPage):
    18731873    grok.context(IStudentStudyCourse)
    18741874    grok.name('start_course_registration')
    … …  
    19391939        return self.view.url(self.view.context, self.target)
    19401940
    1941 class AddStudyLevelFormPage(WAeUPEditFormPage):
     1941class AddStudyLevelFormPage(SIRPEditFormPage):
    19421942    """ Page for students to add current study levels
    19431943    """
    … …  
    19951995        return self.view.url(self.view.context, self.target)
    19961996
    1997 class StudyLevelEditFormPage(WAeUPEditFormPage):
     1997class StudyLevelEditFormPage(SIRPEditFormPage):
    19981998    """ Page to edit the student study level data by students
    19991999    """

  • main/waeup.sirp/trunk/src/waeup/sirp/students/interfaces.py

    r7304 r7321  
    2020from zope import schema
    2121from waeup.sirp.interfaces import (
    22     IWAeUPObject, academic_sessions_vocab, validate_email)
     22    ISIRPObject, academic_sessions_vocab, validate_email)
    2323from waeup.sirp.schema import TextLineChoice
    2424from waeup.sirp.university.vocabularies import CourseSource, study_modes
    … …  
    5656        """
    5757
    58 class IStudentsContainer(IWAeUPObject):
     58class IStudentsContainer(ISIRPObject):
    5959    """A students container contains university students.
    6060
    … …  
    9595        """
    9696
    97 class IStudentNavigation(IWAeUPObject):
     97class IStudentNavigation(ISIRPObject):
    9898    """Interface needed for student navigation.
    9999
    … …  
    104104        """
    105105
    106 class IStudentBase(IWAeUPObject):
     106class IStudentBase(ISIRPObject):
    107107    """Representation of student base data.
    108108
    … …  
    173173        )
    174174
    175 class IStudentClearance(IWAeUPObject):
     175class IStudentClearance(ISIRPObject):
    176176    """Representation of student clearance data.
    177177
    … …  
    194194        )
    195195
    196 class IStudentPersonal(IWAeUPObject):
     196class IStudentPersonal(ISIRPObject):
    197197    """Representation of student personal data.
    198198
    … …  
    228228        )
    229229
    230 class IStudentStudyCourse(IWAeUPObject):
     230class IStudentStudyCourse(ISIRPObject):
    231231    """A container for student study levels.
    232232
    … …  
    295295        )
    296296
    297 class IStudentStudyLevel(IWAeUPObject):
     297class IStudentStudyLevel(ISIRPObject):
    298298    """A container for course tickets.
    299299
    … …  
    317317        )
    318318
    319 class ICourseTicket(IWAeUPObject):
     319class ICourseTicket(ISIRPObject):
    320320    """A course ticket.
    321321
    … …  
    362362        )
    363363
    364 class IStudentAccommodation(IWAeUPObject):
     364class IStudentAccommodation(ISIRPObject):
    365365    """A container for student accommodation objects.
    366366
    367367    """
    368368
    369 class IBedTicket(IWAeUPObject):
     369class IBedTicket(ISIRPObject):
    370370    """A ticket for accommodation booking.
    371371

  • main/waeup.sirp/trunk/src/waeup/sirp/students/student.py

    r7256 r7321  
    2727from waeup.sirp.interfaces import (
    2828    IObjectHistory, IUserAccount, IFileStoreNameChooser, IFileStoreHandler)
    29 from waeup.sirp.image import WAeUPImageFile
     29from waeup.sirp.image import SIRPImageFile
    3030from waeup.sirp.imagestorage import DefaultFileStoreHandler
    3131from waeup.sirp.students.interfaces import (
    … …  
    257257            StudentFileStoreHandler, self).createFile(
    258258            store, root,  filename, file_id, file)
    259         return file, path, WAeUPImageFile(
     259        return file, path, SIRPImageFile(
    260260            file_obj.filename, file_obj.data)

  • main/waeup.sirp/trunk/src/waeup/sirp/students/viewlets.py

    r7319 r7321  
    2121from zope.interface import Interface
    2222from waeup.sirp.interfaces import (
    23     IWAeUPObject, IExtFileStore, IFileStoreNameChooser)
     23    ISIRPObject, IExtFileStore, IFileStoreNameChooser)
    2424from waeup.sirp.utils.helpers import string_from_bytes, file_size
    2525from waeup.sirp.browser import DEFAULT_IMAGE_PATH
    … …  
    3232from waeup.sirp.students.interfaces import IStudent, IStudentClearance
    3333
    34 grok.context(IWAeUPObject) # Make IWAeUPObject the default context
     34grok.context(ISIRPObject) # Make ISIRPObject the default context
    3535grok.templatedir('browser_templates')
    3636
    … …  
    4747    grok.baseclass()
    4848    grok.viewletmanager(StudentManageSidebar)
    49     grok.context(IWAeUPObject)
     49    grok.context(ISIRPObject)
    5050    grok.view(Interface)
    5151    grok.order(5)
    … …  
    108108    grok.baseclass()
    109109    grok.viewletmanager(StudentMenu)
    110     grok.context(IWAeUPObject)
     110    grok.context(ISIRPObject)
    111111    grok.view(Interface)
    112112    grok.order(5)
    … …  
    162162    """
    163163
    164     grok.context(IWAeUPObject)
     164    grok.context(ISIRPObject)
    165165    grok.order(4)
    166166    grok.require('waeup.viewStudentsTab')

  • main/waeup.sirp/trunk/src/waeup/sirp/students/vocabularies.py

    r7214 r7321  
    2525from zc.sourcefactory.basic import BasicSourceFactory
    2626from zc.sourcefactory.contextual import BasicContextualSourceFactory
    27 from waeup.sirp.interfaces import SimpleWAeUPVocabulary
     27from waeup.sirp.interfaces import SimpleSIRPVocabulary
    2828from waeup.sirp.students.lgas import LGAS
    2929from waeup.sirp.university.vocabularies import course_levels
    3030
    31 lgas_vocab = SimpleWAeUPVocabulary(
     31lgas_vocab = SimpleSIRPVocabulary(
    3232    *sorted([(x[1],x[0]) for x in LGAS]))
    3333
    … …  
    7171        return title
    7272
    73 verdicts = SimpleWAeUPVocabulary(
     73verdicts = SimpleSIRPVocabulary(
    7474    ('not yet','0'),
    7575    ('Successful student','A'),

  • main/waeup.sirp/trunk/src/waeup/sirp/students/workflow.py

    r7133 r7321  
    55from hurry.workflow.interfaces import IWorkflowState, IWorkflowTransitionEvent
    66from waeup.sirp.interfaces import (
    7     IObjectHistory, IWAeUPWorkflowInfo,
     7    IObjectHistory, ISIRPWorkflowInfo,
    88    CREATED, ADMITTED, CLEARANCE, REQUESTED, CLEARED, PAID, RETURNING,
    99    REGISTERED, VALIDATED)
    10 from waeup.sirp.workflow import WAeUPWorkflow, WAeUPWorkflowInfo
     10from waeup.sirp.workflow import SIRPWorkflow, SIRPWorkflowInfo
    1111from waeup.sirp.utils.helpers import get_current_principal
    1212from waeup.sirp.students.interfaces import IStudent
    … …  
    152152UNLOCK_CLEARANCE_TRANS = ('reset3', 'reset4', 'start_clearance')
    153153
    154 registration_workflow = WAeUPWorkflow(REGISTRATION_TRANSITIONS)
     154registration_workflow = SIRPWorkflow(REGISTRATION_TRANSITIONS)
    155155
    156156class RegistrationWorkflowState(WorkflowState, grok.Adapter):
    … …  
    163163    state_id = 'wf.registration.id'
    164164
    165 class RegistrationWorkflowInfo(WAeUPWorkflowInfo, grok.Adapter):
     165class RegistrationWorkflowInfo(SIRPWorkflowInfo, grok.Adapter):
    166166    """Adapter to adapt Student objects to workflow info objects.
    167167    """
    168168    grok.context(IStudent)
    169     grok.provides(IWAeUPWorkflowInfo)
     169    grok.provides(ISIRPWorkflowInfo)
    170170
    171171    def __init__(self, context):

  • main/waeup.sirp/trunk/src/waeup/sirp/testing.py

    r7193 r7321  
    161161         If you use the Zope testrunner (from :mod:`zope.testing`)
    162162         then you have to use appropriate layers like the
    163          :class:`waeup.sirp.testing.WAeUPSIRPUnitTestLayer`.
     163         :class:`waeup.sirp.testing.SIRPUnitTestLayer`.
    164164
    165165    Usage with :mod:`zope.testing` testrunners
    … …  
    170170    like the one defined in this module.
    171171
    172     .. seealso:: :class:`waeup.sirp.testing.WAeUPSIRPUnitTestLayer`
     172    .. seealso:: :class:`waeup.sirp.testing.SIRPUnitTestLayer`
    173173
    174174    """
    … …  
    187187
    188188
    189 class WAeUPSIRPUnitTestLayer(object):
     189class SIRPUnitTestLayer(object):
    190190    """A layer for tests that groks `waeup.sirp`.
    191191
    … …  
    210210
    211211      import unittest
    212       from waeup.sirp.testing import WAeUPSIRPUnitTestLayer
     212      from waeup.sirp.testing import SIRPUnitTestLayer
    213213
    214214      class MyTestCase(unittest.TestCase):
    215215
    216           layer = WAeUPSIRPUnitTestLayer
     216          layer = SIRPUnitTestLayer
    217217
    218218          # per-test setups and real tests go here...

  • main/waeup.sirp/trunk/src/waeup/sirp/tests/test_interfaces.py

    r7193 r7321  
    4848        # Register a role not visible to waeup portal as its name does
    4949        # not start with 'waeup.'
    50         class NonWAeUPRole(grok.Role):
     50        class NonSIRPRole(grok.Role):
    5151            grok.name('nonwaeup.testrole')
    5252            grok.title('Role not suitable for waeup')
    5353            grok.permissions('waeup.Public')
    5454        grok.testing.grok_component('SomeRole', SomeRole)
    55         grok.testing.grok_component('NonWAeUPRole', NonWAeUPRole)
     55        grok.testing.grok_component('NonSIRPRole', NonSIRPRole)
    5656        return
    5757

  • main/waeup.sirp/trunk/src/waeup/sirp/tests/test_objecthistory.py

    r7193 r7321  
    2626from zope.security.testing import Principal, Participation
    2727from waeup.sirp.app import University
    28 from waeup.sirp.interfaces import IObjectHistory, IWAeUPObject
     28from waeup.sirp.interfaces import IObjectHistory, ISIRPObject
    2929from waeup.sirp.testing import FunctionalTestCase, FunctionalLayer
    3030from waeup.sirp.objecthistory import ObjectHistory
    3131
    3232class SampleObject(grok.Model):
    33     grok.implements(IWAeUPObject)
     33    grok.implements(ISIRPObject)
    3434    pass
    3535

  • main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.py

    r7210 r7321  
    1616## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1717##
    18 """WAeUP portal certificates
     18"""SIRP certificates
    1919"""
    2020import grok

  • main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.txt

    r6244 r7321  
    1 :mod:`waeup.sirp.university.certificate` -- Certificates for WAeUP
     1:mod:`waeup.sirp.university.certificate` -- Certificates for SIRP
    22******************************************************************
    33
    … …  
    77
    88.. :doctest:
    9 .. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
     9.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
    1010
    1111

  • main/waeup.sirp/trunk/src/waeup/sirp/university/certificatecontainer.txt

    r6231 r7321  
    77
    88.. :doctest:
    9 .. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
     9.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
    1010
    1111

  • main/waeup.sirp/trunk/src/waeup/sirp/university/course.txt

    r5944 r7321  
    77
    88.. :doctest:
    9 .. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
     9.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
    1010
    1111Content Classes (models and containers)

  • main/waeup.sirp/trunk/src/waeup/sirp/university/coursecontainer.txt

    r6245 r7321  
    77
    88.. :doctest:
    9 .. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
     9.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
    1010
    1111

  • main/waeup.sirp/trunk/src/waeup/sirp/university/department.txt

    r5140 r7321  
    77
    88.. :doctest:
    9 .. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
     9.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
    1010
    1111Content Classes (models and containers)

  • main/waeup.sirp/trunk/src/waeup/sirp/university/faculty.txt

    r6979 r7321  
    77
    88.. :doctest:
    9 .. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
     9.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
    1010
    1111

  • main/waeup.sirp/trunk/src/waeup/sirp/university/facultycontainer.py

    r7195 r7321  
    1919from zope.component.interfaces import IFactory
    2020from zope.interface import implementedBy
    21 from waeup.sirp.interfaces import IWAeUPSIRPPluggable
     21from waeup.sirp.interfaces import ISIRPPluggable
    2222from waeup.sirp.university.interfaces import IFacultyContainer, IFaculty
    2323
    … …  
    5151    """A plugin that creates a faculty container inside a university.
    5252    """
    53     grok.implements(IWAeUPSIRPPluggable)
     53    grok.implements(ISIRPPluggable)
    5454    grok.name('faculties')
    5555
    5656    def setup(self, site, name, logger):
    5757        if 'faculties' in site.keys():
    58             logger.warn('Could not create faculty container in WAeUP SIRP.')
     58            logger.warn('Could not create faculty container in SIRP.')
    5959            return
    6060        site['faculties'] = FacultyContainer()

  • main/waeup.sirp/trunk/src/waeup/sirp/university/facultycontainer.txt

    r6979 r7321  
    77
    88.. :doctest:
    9 .. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
     9.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
    1010
    1111
    … …  
    7777.. class:: AcademicsPlugin()
    7878
    79    .. attribute:: grok.implements(IWAeUPSIRPPluggable)
     79   .. attribute:: grok.implements(ISIRPPluggable)
    8080
    8181   This plugin component tells under which name (``faculties``) an
    82    instance of academics stuff should be created in plain WAeUP SIRP
     82   instance of academics stuff should be created in plain SIRP
    8383   instances. It also tells the factory name for FacultyContainer
    84    instances, which serve as root object for academics stuff in WAeUP
    85    SIRP apps.
     84   instances, which serve as root object for academics stuff in SIRP apps.
    8685
    8786

  • main/waeup.sirp/trunk/src/waeup/sirp/university/interfaces.py

    r7195 r7321  
    2020from zope import schema
    2121from zope.interface import Attribute
    22 from waeup.sirp.interfaces import (IWAeUPObject, IWAeUPContainer)
     22from waeup.sirp.interfaces import (ISIRPObject, ISIRPContainer)
    2323
    2424from waeup.sirp.university.vocabularies import (
    … …  
    3232
    3333
    34 class IFaculty(IWAeUPContainer):
     34class IFaculty(ISIRPContainer):
    3535    """Representation of a university faculty.
    3636    """
    … …  
    7373IFacultyAdd['code'].order =  IFaculty['code'].order
    7474
    75 class IFacultyContainer(IWAeUPContainer):
     75class IFacultyContainer(ISIRPContainer):
    7676    """A container for faculties.
    7777    """
    … …  
    8080
    8181        """
    82 class IDepartment(IWAeUPObject):
     82class IDepartment(ISIRPObject):
    8383    """Representation of a department.
    8484    """
    … …  
    124124IDepartmentAdd['code'].order =  IDepartment['code'].order
    125125
    126 class ICourseContainer(IWAeUPContainer):
     126class ICourseContainer(ISIRPContainer):
    127127    """A container for faculties.
    128128    """
    … …  
    133133        """
    134134
    135 class ICourse(IWAeUPObject):
     135class ICourse(ISIRPObject):
    136136    """Representation of a course.
    137137    """
    … …  
    186186ICourseAdd['code'].order =  ICourse['code'].order
    187187
    188 class ICertificate(IWAeUPObject):
     188class ICertificate(ISIRPObject):
    189189    """Representation of a certificate.
    190190    """
    … …  
    248248ICertificateAdd['code'].order =  ICertificate['code'].order
    249249
    250 class ICertificateContainer(IWAeUPContainer):
     250class ICertificateContainer(ISIRPContainer):
    251251    """A container for certificates.
    252252    """
    … …  
    257257        """
    258258
    259 class ICertificateCourse(IWAeUPObject):
     259class ICertificateCourse(ISIRPObject):
    260260    """A certificatecourse is referring a course and provides some own
    261261       attributes.

  • main/waeup.sirp/trunk/src/waeup/sirp/university/tests/test_facultycontainer.py

    r7195 r7321  
    9090        self.assertEqual(
    9191            self._logger_factory.get_messages(),
    92             'Could not create faculty container in WAeUP SIRP.\n'
     92            'Could not create faculty container in SIRP.\n'
    9393            )
    9494

  • main/waeup.sirp/trunk/src/waeup/sirp/university/vocabularies.py

    r7195 r7321  
    2121from zope.catalog.interfaces import ICatalog
    2222from zope.component import getUtility
    23 from waeup.sirp.interfaces import SimpleWAeUPVocabulary
     23from waeup.sirp.interfaces import SimpleSIRPVocabulary
    2424
    25 inst_types = SimpleWAeUPVocabulary(
     25inst_types = SimpleSIRPVocabulary(
    2626    ('Faculty of','faculty'),
    2727    ('Department of','department'),
    … …  
    3434    )
    3535
    36 course_levels = SimpleWAeUPVocabulary(
     36course_levels = SimpleSIRPVocabulary(
    3737    ('Pre-Studies',0),
    3838    ('100 (Year 1)',100),
    … …  
    4646    )
    4747
    48 semester = SimpleWAeUPVocabulary(
     48semester = SimpleSIRPVocabulary(
    4949    ('N/A', 0),
    5050    ('First Semester', 1),
    … …  
    5353    )
    5454
    55 application_categories = SimpleWAeUPVocabulary(
     55application_categories = SimpleSIRPVocabulary(
    5656    ('PUME, PDE, PCE, PRENCE','basic'),
    5757    ('Part-Time, Diploma, Certificate','cest'),
    … …  
    6060    )
    6161
    62 study_modes = SimpleWAeUPVocabulary(
     62study_modes = SimpleSIRPVocabulary(
    6363    ('UME Full Time','ume_ft'),
    6464    ('Direct Entry Full Time','de_ft'),

  • main/waeup.sirp/trunk/src/waeup/sirp/userscontainer.py

    r7233 r7321  
    1616## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1717##
    18 """Users container for the WAeUP portal.
     18"""Users container for the SIRP portal.
    1919"""
    2020import grok

  • main/waeup.sirp/trunk/src/waeup/sirp/userscontainer.txt

    r7197 r7321  
    1 User container for the WAeUP portal
    2 ***********************************
     1User container for the SIRP
     2***************************
    33
    44.. :doctest:
    5 .. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
     5.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
    66
    77Before we can start, we need some password managers available:

  • main/waeup.sirp/trunk/src/waeup/sirp/utils/batching.py

    r7273 r7321  
    1616## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1717##
    18 """WAeUP components for batch processing.
     18"""SIRP components for batch processing.
    1919
    2020Batch processors eat CSV files to add, update or remove large numbers

  • main/waeup.sirp/trunk/src/waeup/sirp/utils/converters.txt

    r6276 r7321  
    1010
    1111.. :NOdoctest:
    12 .. :NOlayer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
     12.. :NOlayer: waeup.sirp.testing.SIRPUnitTestLayer
    1313
    1414
    … …  
    672672    '1'
    673673
    674     >>> from waeup.sirp.interfaces import SimpleWAeUPVocabulary
     674    >>> from waeup.sirp.interfaces import SimpleSIRPVocabulary
    675675    >>> field = Choice(
    676676    ...   title = u'Favourite Dish',
    677677    ...   default = 0,
    678     ...   vocabulary = SimpleWAeUPVocabulary(
     678    ...   vocabulary = SimpleSIRPVocabulary(
    679679    ...        ('N/A', 0), ('Pizza', 1),
    680680    ...        ('Cake', 2), ('Muffins', 3)),

  • main/waeup.sirp/trunk/src/waeup/sirp/utils/helpers.py

    r7240 r7321  
    1616## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1717##
    18 """General helper functions for WAeUP.
     18"""General helper functions for SIRP.
    1919"""
    2020import os

  • main/waeup.sirp/trunk/src/waeup/sirp/utils/helpers.txt

    r7186 r7321  
    1 :mod:`waeup.sirp.utils.helpers` -- Helpers for the WAeUP SRP
    2 ************************************************************
     1:mod:`waeup.sirp.utils.helpers` -- Helpers for SIRP
     2***************************************************
    33
    44.. module:: waeup.sirp.utils.helpers
    55
    6 Helper functions for the WAeUP SRP.
     6Helper functions for SIRP.
    77
    88.. :doctest:

  • main/waeup.sirp/trunk/src/waeup/sirp/utils/importexport.py

    r7196 r7321  
    2222from cStringIO import StringIO
    2323from zope.interface import Interface
    24 from waeup.sirp.interfaces import (IWAeUPObject, IWAeUPExporter,
    25                                    IWAeUPXMLExporter, IWAeUPXMLImporter)
     24from waeup.sirp.interfaces import (ISIRPObject, ISIRPExporter,
     25                                   ISIRPXMLExporter, ISIRPXMLImporter)
    2626
    2727def readFile(f):
    … …  
    4040
    4141class Exporter(grok.Adapter):
    42     """Export a WAeUP object as pickle.
     42    """Export a SIRP object as pickle.
    4343
    4444    This all-purpose exporter exports attributes defined in schemata
    4545    and contained objects (if the exported thing is a container).
    4646    """
    47     grok.context(IWAeUPObject)
    48     grok.provides(IWAeUPExporter)
     47    grok.context(ISIRPObject)
     48    grok.provides(ISIRPExporter)
    4949
    5050    def __init__(self, context):
    … …  
    6161
    6262class XMLExporter(grok.Adapter):
    63     """Export a WAeUP object as XML.
     63    """Export a SIRP object as XML.
    6464
    6565    This all-purpose exporter exports XML representations of pickable
    … …  
    6767    """
    6868    grok.context(Interface)
    69     grok.provides(IWAeUPXMLExporter)
     69    grok.provides(ISIRPXMLExporter)
    7070
    7171    def __init__(self, context):
    … …  
    8484
    8585class XMLImporter(grok.Adapter):
    86     """Import a WAeUP object from XML.
     86    """Import a SIRP object from XML.
    8787    """
    8888    grok.context(Interface)
    89     grok.provides(IWAeUPXMLImporter)
     89    grok.provides(ISIRPXMLImporter)
    9090
    9191    def __init__(self, context):

  • main/waeup.sirp/trunk/src/waeup/sirp/utils/importexport.txt

    r5140 r7321  
    66
    77.. :doctest:
    8 .. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
     8.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
    99
    1010As imports and exports of data are a cruical point when doing updates
    … …  
    6060an exporter::
    6161
    62     >>> from waeup.sirp.interfaces import IWAeUPXMLExporter
    63     >>> exporter = IWAeUPXMLExporter(mycave)
     62    >>> from waeup.sirp.interfaces import ISIRPXMLExporter
     63    >>> exporter = ISIRPXMLExporter(mycave)
    6464    >>> exporter
    6565    <waeup.sirp.utils.importexport.XMLExporter object at 0x...>
    … …  
    101101Now we create an importer for that object:
    102102
    103     >>> from waeup.sirp.interfaces import IWAeUPXMLImporter
    104     >>> importer = IWAeUPXMLImporter(mycave)
     103    >>> from waeup.sirp.interfaces import ISIRPXMLImporter
     104    >>> importer = ISIRPXMLImporter(mycave)
    105105
    106106Importing from filenames

  • main/waeup.sirp/trunk/src/waeup/sirp/utils/tests/test_converters.py

    r7196 r7321  
    3636from waeup.sirp.utils.converters import IObjectConverter
    3737from waeup.sirp.utils.helpers import attrs_to_fields
    38 from waeup.sirp.interfaces import SimpleWAeUPVocabulary
    39 
    40 colors = SimpleWAeUPVocabulary(
     38from waeup.sirp.interfaces import SimpleSIRPVocabulary
     39
     40colors = SimpleSIRPVocabulary(
    4141    ('Red', u'red'),
    4242    ('Green', u'green'),
    4343    ('Blue', u'blue'),
    4444    )
    45 car_nums = SimpleWAeUPVocabulary(
     45car_nums = SimpleSIRPVocabulary(
    4646    ('None', 0),
    4747    ('One', 1),

  • main/waeup.sirp/trunk/src/waeup/sirp/widgets/__init__.py

    r7137 r7321  
    1 """JS-driven widgets for WAeUP.
     1"""JS-driven widgets for SIRP.
    22"""

  • main/waeup.sirp/trunk/src/waeup/sirp/widgets/objectwidget.py

    r7196 r7321  
    2525from zope.schema import getFieldNamesInOrder
    2626
    27 class WAeUPObjectWidgetView(ObjectWidgetView):
     27class SIRPObjectWidgetView(ObjectWidgetView):
    2828    template = ViewPageTemplateFile('objectwidget.pt')
    2929
    30 class WAeUPObjectWidget(ObjectWidget):
     30class SIRPObjectWidget(ObjectWidget):
    3131
    3232    def __init__(self, context, request, factory, **kw):
    … …  
    5858
    5959    def _getView(self, request):
    60         return WAeUPObjectWidgetView(self, request)
     60        return SIRPObjectWidgetView(self, request)
    6161
    62 class WAeUPObjectDisplayWidget(WAeUPObjectWidget):
     62class SIRPObjectDisplayWidget(SIRPObjectWidget):
    6363
    6464    implementsOnly(IDisplayWidget)

  • main/waeup.sirp/trunk/src/waeup/sirp/widgets/tests/test_objectwidget.py

    r7196 r7321  
    3838from zope.formlib.interfaces import IWidgetInputErrorView
    3939
    40 from waeup.sirp.widgets.objectwidget import WAeUPObjectWidget as ObjectWidget
     40from waeup.sirp.widgets.objectwidget import SIRPObjectWidget as ObjectWidget
    4141from waeup.sirp.widgets.objectwidget import (
    42     WAeUPObjectDisplayWidget as ObjectDisplayWidget)
     42    SIRPObjectDisplayWidget as ObjectDisplayWidget)
    4343
    4444class ITestContact(Interface):

  • main/waeup.sirp/trunk/src/waeup/sirp/workflow.py

    r7193 r7321  
    2525from zope.security.interfaces import NoInteraction
    2626from zope.security.management import getInteraction
    27 from waeup.sirp.interfaces import IWAeUPWorkflowInfo
     27from waeup.sirp.interfaces import ISIRPWorkflowInfo
    2828
    29 class WAeUPWorkflow(Workflow):
     29class SIRPWorkflow(Workflow):
    3030    """A :mod:`hurry.workflow` workflow with more appropriate error
    3131       messages.
    … …  
    7171        return False
    7272
    73 class WAeUPWorkflowInfo(WorkflowInfo):
     73class SIRPWorkflowInfo(WorkflowInfo):
    7474    """A workflow info that provides a convenience transition getter.
    7575    """
    7676
    77     grok.provides(IWAeUPWorkflowInfo)
     77    grok.provides(ISIRPWorkflowInfo)
    7878
    7979    def getManualTransitions(self):
Note: See TracChangeset for help on using the changeset viewer.