Changeset 5873 for main


Ignore:
Timestamp:
18 Mar 2011, 06:50:02 (14 years ago)
Author:
Henrik Bettermann
Message:

Add company to user data and show on members page.

Location:
main/waeup.plonetheme/trunk/waeup/plonetheme
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.plonetheme/trunk/waeup/plonetheme/adapter.py

    r5871 r5873  
    1515    position = property(get_position, set_position)
    1616
     17    def get_company(self):
     18        return self.context.getProperty('company', '')
     19    def set_company(self, value):
     20        membership = getToolByName(self.context, 'portal_membership')
     21        return self.context.setMemberProperties({'company': value})
     22    company = property(get_company, set_company)
    1723
    1824

  • main/waeup.plonetheme/trunk/waeup/plonetheme/locales/de/LC_MESSAGES/waeup.po

    r5871 r5873  
    33msgstr ""
    44"Project-Id-Version: waeup.plonethemes\n"
    5 "POT-Creation-Date: 2011-03-17 11:59+0000\n"
     5"POT-Creation-Date: 2011-03-18 06:33+0000\n"
    66"PO-Revision-Date: 2011-02-07 17:26+0000\n"
    77"Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
    … …  
    4242
    4343#. Default: "Homepage"
    44 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:97
     44#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:98
    4545msgid "author_homepage"
    4646msgstr "Hompage"
    4747
     48#. Default: "Company"
     49#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:86
     50msgid "company"
     51msgstr "Firma"
     52
    4853#. Default: "No members found."
    49 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:128
     54#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:124
    5055msgid "description_no_results_found"
    5156msgstr "Keine Mitglieder gefunden."
    5257
    5358#. Default: "Project Members"
    54 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:20
     59#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:22
    5560msgid "heading_list_members"
    5661msgstr "Projektmitglieder"
     62
     63#. Default: "The company you are working for"
     64#: .././userdataschema.py:34
     65msgid "help_company"
     66msgstr "Die Firma, für die du arbeitest"
    5767
    5868#. Default: "Your WAeUP position (write-protected)"
    … …  
    6070msgid "help_position"
    6171msgstr "Deine Position im WAeUP (schreibgeschützt)"
     72
     73#. Default: "Company"
     74#: .././userdataschema.py:33
     75msgid "label_company"
     76msgstr "Firma"
    6277
    6378#. Default: "Position"
    … …  
    6782
    6883#. Default: "Location"
    69 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:87
     84#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:88
    7085msgid "location"
    7186msgstr "Ort"
    7287
    7388#. Default: "You are not allowed to list portal members."
    74 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:28
     89#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:30
    7590msgid "member_listing_not_allowed"
    7691msgstr "Das Mitgliederverzeichnis ist nicht einsehbar."
    7792
    7893#. Default: "If you are a WAeUP member but don't see your name here, login with your credentials and fill the personal data form. After saving the form, your name will be automatically listed."
    79 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:23
     94#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:25
    8095msgid "name_not_listed"
    8196msgstr "Wenn du ein WAeUP-Mitglied bist, jedoch deinen Namen hier nicht findest, logge dich bitte ein und fülle das Formular 'Meine Einstellungen' aus. Nach dem Abspeichern wird dein Name automatisch erscheinen."
    8297
    8398#. Default: "Personal Preferences"
    84 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:103
     99#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:104
    85100msgid "personal_preferences"
    86101msgstr "Persönliche Einstellungen"
    87102
    88103#. Default: "Position"
    89 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:89
     104#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:90
    90105msgid "position"
    91106msgstr "Stellung"
    92107
    93108#. Default: "Send Feedback"
    94 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:91
     109#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:92
    95110msgid "send_feedback"
    96111msgstr "Sende Rückmeldung"

  • main/waeup.plonetheme/trunk/waeup/plonetheme/locales/en/LC_MESSAGES/waeup.po

    r5871 r5873  
    33msgstr ""
    44"Project-Id-Version: waeup.plonethemes\n"
    5 "POT-Creation-Date: 2011-03-17 11:59+0000\n"
     5"POT-Creation-Date: 2011-03-18 06:33+0000\n"
    66"PO-Revision-Date: 2011-02-07 17:26+0000\n"
    77"Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
    … …  
    4242
    4343#. Default: "Homepage"
    44 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:97
     44#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:98
    4545msgid "author_homepage"
    4646msgstr ""
    4747
     48#. Default: "Company"
     49#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:86
     50msgid "company"
     51msgstr ""
     52
    4853#. Default: "No members found."
    49 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:128
     54#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:124
    5055msgid "description_no_results_found"
    5156msgstr ""
    5257
    5358#. Default: "Project Members"
    54 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:20
     59#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:22
    5560msgid "heading_list_members"
     61msgstr ""
     62
     63#. Default: "The company you are working for"
     64#: .././userdataschema.py:34
     65msgid "help_company"
    5666msgstr ""
    5767
    … …  
    5969#: .././userdataschema.py:28
    6070msgid "help_position"
     71msgstr ""
     72
     73#. Default: "Company"
     74#: .././userdataschema.py:33
     75msgid "label_company"
    6176msgstr ""
    6277
    … …  
    6782
    6883#. Default: "Location"
    69 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:87
     84#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:88
    7085msgid "location"
    7186msgstr ""
    7287
    7388#. Default: "You are not allowed to list portal members."
    74 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:28
     89#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:30
    7590msgid "member_listing_not_allowed"
    7691msgstr ""
    7792
    7893#. Default: "If you are a WAeUP member but don't see your name here, login with your credentials and fill the personal data form. After saving the form, your name will be automatically listed."
    79 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:23
     94#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:25
    8095msgid "name_not_listed"
    8196msgstr ""
    8297
    8398#. Default: "Personal Preferences"
    84 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:103
     99#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:104
    85100msgid "personal_preferences"
    86101msgstr ""
    87102
    88103#. Default: "Position"
    89 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:89
     104#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:90
    90105msgid "position"
    91106msgstr ""
    92107
    93108#. Default: "Send Feedback"
    94 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:91
     109#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:92
    95110msgid "send_feedback"
    96111msgstr ""

  • main/waeup.plonetheme/trunk/waeup/plonetheme/locales/fr/LC_MESSAGES/waeup.po

    r5871 r5873  
    33msgstr ""
    44"Project-Id-Version: waeup.plonethemes\n"
    5 "POT-Creation-Date: 2011-03-17 11:59+0000\n"
     5"POT-Creation-Date: 2011-03-18 06:33+0000\n"
    66"PO-Revision-Date: 2011-02-07 17:26+0000\n"
    77"Last-Translator: Issoufou Abba Moussa <isouaba@waeup.org>\n"
    … …  
    4242
    4343#. Default: "Homepage"
    44 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:97
     44#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:98
    4545#, fuzzy
    4646msgid "author_homepage"
    4747msgstr "page d'acceuil membre "
    4848
     49#. Default: "Company"
     50#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:86
     51msgid "company"
     52msgstr ""
     53
    4954#. Default: "No members found."
    50 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:128
     55#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:124
    5156msgid "description_no_results_found"
    5257msgstr "Aucun résultat trouvé."
    5358
    5459#. Default: "Project Members"
    55 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:20
     60#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:22
    5661msgid "heading_list_members"
    5762msgstr "Membres"
     63
     64#. Default: "The company you are working for"
     65#: .././userdataschema.py:34
     66msgid "help_company"
     67msgstr ""
    5868
    5969#. Default: "Your WAeUP position (write-protected)"
    6070#: .././userdataschema.py:28
    6171msgid "help_position"
     72msgstr ""
     73
     74#. Default: "Company"
     75#: .././userdataschema.py:33
     76msgid "label_company"
    6277msgstr ""
    6378
    … …  
    6883
    6984#. Default: "Location"
    70 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:87
     85#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:88
    7186msgid "location"
    7287msgstr ""
    7388
    7489#. Default: "You are not allowed to list portal members."
    75 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:28
     90#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:30
    7691msgid "member_listing_not_allowed"
    7792msgstr "Vous n'avez pas ce privilège"
    7893
    7994#. Default: "If you are a WAeUP member but don't see your name here, login with your credentials and fill the personal data form. After saving the form, your name will be automatically listed."
    80 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:23
     95#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:25
    8196msgid "name_not_listed"
    8297msgstr "Si vous êtes membre WAeUP mais ne voyez pas votre nom ici, vous connecter avec vos identifiant et mot de passe. Après l'enregistrement du formulaire personel, votre nom sera automatiquement répertorié."
    8398
    8499#. Default: "Personal Preferences"
    85 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:103
     100#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:104
    86101#, fuzzy
    87102msgid "personal_preferences"
    … …  
    89104
    90105#. Default: "Position"
    91 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:89
     106#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:90
    92107msgid "position"
    93108msgstr ""
    94109
    95110#. Default: "Send Feedback"
    96 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:91
     111#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:92
    97112#, fuzzy
    98113msgid "send_feedback"

  • main/waeup.plonetheme/trunk/waeup/plonetheme/locales/waeup.pot

    r5871 r5873  
    33msgstr ""
    44"Project-Id-Version: waeup.plonethemes\n"
    5 "POT-Creation-Date: 2011-03-17 11:59+0000\n"
     5"POT-Creation-Date: 2011-03-18 06:33+0000\n"
    66"PO-Revision-Date: 2011-02-07 17:26+0000\n"
    77"Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
    … …  
    3737
    3838#. Default: "Homepage"
    39 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:97
     39#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:98
    4040msgid "author_homepage"
    4141msgstr ""
    4242
     43#. Default: "Company"
     44#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:86
     45msgid "company"
     46msgstr ""
     47
    4348#. Default: "No members found."
    44 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:128
     49#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:124
    4550msgid "description_no_results_found"
    4651msgstr ""
    4752
    4853#. Default: "Project Members"
    49 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:20
     54#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:22
    5055msgid "heading_list_members"
     56msgstr ""
     57
     58#. Default: "The company you are working for"
     59#: .././userdataschema.py:34
     60msgid "help_company"
    5161msgstr ""
    5262
    … …  
    5464#: .././userdataschema.py:28
    5565msgid "help_position"
     66msgstr ""
     67
     68#. Default: "Company"
     69#: .././userdataschema.py:33
     70msgid "label_company"
    5671msgstr ""
    5772
    … …  
    6277
    6378#. Default: "Location"
    64 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:87
     79#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:88
    6580msgid "location"
    6681msgstr ""
    6782
    6883#. Default: "You are not allowed to list portal members."
    69 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:28
     84#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:30
    7085msgid "member_listing_not_allowed"
    7186msgstr ""
    7287
    7388#. Default: "If you are a WAeUP member but don't see your name here, login with your credentials and fill the personal data form. After saving the form, your name will be automatically listed."
    74 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:23
     89#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:25
    7590msgid "name_not_listed"
    7691msgstr ""
    7792
    7893#. Default: "Personal Preferences"
    79 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:103
     94#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:104
    8095msgid "personal_preferences"
    8196msgstr ""
    8297
    8398#. Default: "Position"
    84 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:89
     99#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:90
    85100msgid "position"
    86101msgstr ""
    87102
    88103#. Default: "Send Feedback"
    89 #: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:91
     104#: .././skins/waeup_plonetheme_custom_templates/member_search_form.pt:92
    90105msgid "send_feedback"
    91106msgstr ""

  • main/waeup.plonetheme/trunk/waeup/plonetheme/profiles/default/memberdata_properties.xml

    r5870 r5873  
    22<object name="portal_memberdata" meta_type="Plone Memberdata Tool">
    33 <property name="position" type="string"></property>
     4 <property name="company" type="string"></property>
    45</object>

  • main/waeup.plonetheme/trunk/waeup/plonetheme/skins/waeup_plonetheme_custom_templates/member_search_form.pt

    r5871 r5873  
    5454                                    portrait python:pm.getPersonalPortrait(id);
    5555                                    position python:result.getProperty('position');
     56                                    company python:result.getProperty('company');
    5657                                    home_base python:pm.getHomeUrl(id, verifyPermission=1);"
    5758                        tal:condition="python:Group[0] in result.getGroupNames() and not id.endswith('1') and (author['fullname'] or not is_anonymous)">
    … …  
    8485                           
    8586                      <td style="width: 22%; vertical-align:top;">
     87                       <span i18n:translate="company">Company</span>: <span tal:content="company|nothing">Company</span>
     88                       <br />
    8689                       <span i18n:translate="location">Location</span>: <span tal:content="author/location|nothing">Location</span>
    8790                       <br />

  • main/waeup.plonetheme/trunk/waeup/plonetheme/userdataschema.py

    r5872 r5873  
    2929                      default=u"Your WAeUP position (write-protected)"),
    3030        required=False)
     31       
     32    company = schema.TextLine(
     33        title=_(u'label_company', default=u'Company'),
     34        description=_(u'help_company',
     35                      default=u"The company you are working for"),
     36        required=False)       
    3137
Note: See TracChangeset for help on using the changeset viewer.