Changeset 744:946f1d196dd2


Ignore:
Timestamp:
07/09/10 13:40:32 (23 months ago)
Author:
fl
Branch:
trunk
Message:

[svn r1089] topic->norm rename; change norm creation process

Location:
adhocracy
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • adhocracy/controllers/page.py

    r743 r744  
    121121            page.parents.append(self.form_result.get("parent")) 
    122122         
    123         target = page # by default, redirect to the page 
     123        target = h.entity_url(page) # by default, redirect to the page 
    124124        if proposal is not None and _function == model.Page.NORM: 
    125125            #variant = libtext.variant_normalize(proposal.title) 
    … …  
    130130            # if a selection was created, go there instead: 
    131131            if can.selection.create(proposal): 
    132                 target = model.Selection.create(proposal, page, c.user) 
     132                selection = model.Selection.create(proposal, page, c.user) 
     133                target = h.entity_url(page, member='%20/edit', query={'proposal': proposal.id}) 
    133134                #poll = target.variant_poll(variant) 
    134135                #if poll and can.poll.vote(poll): 
    … …  
    142143                   topics=[page], page=page, rev=page.head) 
    143144         
    144         redirect(h.entity_url(target)) 
     145        redirect(target) 
    145146 
    146147 
    … …  
    201202         
    202203        text = model.Text.create(c.page, c.variant, c.user,  
    203                       self.form_result.get("title"),  
    204                       self.form_result.get("text"), 
     204                      self.form_result.get("title"), self.form_result.get("text"), 
    205205                      parent=parent_text) 
    206206         

  • adhocracy/controllers/poll.py

    r663 r744  
    102102        votes = decision.make(position) 
    103103        tally = model.Tally.create_from_poll(c.poll) 
     104        event_type = {model.Poll.RATE: event.T_RATING_CAST, 
     105                      model.Poll.SELECT: event.T_SELECT_VARIANT}.get(c.poll.action) 
     106        for vote in votes: 
     107            event.emit(event_type, vote.user, instance=c.instance,  
     108                    topics=[c.poll.scope], vote=vote, poll=c.poll) 
    104109        model.meta.Session.commit() 
    105110         

  • adhocracy/controllers/selection.py

    r665 r744  
    4949            return self.new(proposal_id, errors=i.unpack_errors()) 
    5050         
    51         selection = model.Selection.create(c.proposal, self.form_result.get('page'),  
     51        page = self.form_result.get('page') 
     52        selection = model.Selection.create(c.proposal, page,  
    5253                                           c.user) 
    5354        model.meta.Session.commit() 
    5455        # TODO implement: 
    5556        # TODO emit an event  
     57        if len(page.variants) < 2: 
     58            return redirect(h.entity_url(page, member='%20/edit')) 
    5659        return redirect(h.entity_url(selection)) 
    5760     

  • adhocracy/lib/event/notification/sources.py

    r629 r744  
    1717    Notify users about their voting behaviour, especially about delegated votes. 
    1818    """ 
    19     if event.event == T_VOTE_CAST: 
     19    if event.event in [T_VOTE_CAST, T_SELECT_VARIANT, T_RATING_CAST]: 
    2020        decision = democracy.Decision(event.user, event.poll) 
    2121        before = decision.without_vote(event.vote) 

  • adhocracy/lib/event/types.py

    r654 r744  
    6262                          event_msg=lambda: _(u"deleted the %(instance)s instance")) 
    6363 
    64 T_INSTANCE_JOIN = EventType(u"t_instance_join", pri=2,  
     64T_INSTANCE_JOIN = EventType(u"t_instance_join", pri=1,  
    6565                          subject=lambda: _(u"%(instance)s: %(user)s joined"), 
    6666                          link_path=lambda e: h.entity_url(e.user), 
    6767                          event_msg=lambda: _(u"joined %(instance)s")) 
    6868 
    69 T_INSTANCE_LEAVE = EventType(u"t_instance_leave", pri=2,  
     69T_INSTANCE_LEAVE = EventType(u"t_instance_leave", pri=1,  
    7070                          subject=lambda: _(u"%(instance)s: %(user)s left"), 
    7171                          link_path=lambda e: h.entity_url(e.user), 
    … …  
    8888                          text=lambda e: e.rev.text if e.rev else None) 
    8989 
    90 T_PROPOSAL_EDIT = EventType(u"t_proposal_edit", pri=1,  
     90T_PROPOSAL_EDIT = EventType(u"t_proposal_edit", pri=3,  
    9191                          subject=lambda: _(u"Edit proposal: %(proposal)s"), 
    9292                          link_path=lambda e: h.entity_url(e.proposal), 
    … …  
    104104                          event_msg=lambda: _(u"called a vote on %(proposal)s")) 
    105105 
    106 T_PROPOSAL_DELETE = EventType(u"t_proposal_delete", pri=2,  
     106T_PROPOSAL_DELETE = EventType(u"t_proposal_delete", pri=4,  
    107107                          subject=lambda: _(u"Deleted proposal: %(proposal)s"), 
    108108                          link_path=lambda e: h.entity_url(e.instance), 
    … …  
    127127                        event_msg=lambda: _(u"deleted %(page)s")) 
    128128 
    129 T_COMMENT_CREATE = EventType(u"t_comment_create", pri=2,  
     129T_COMMENT_CREATE = EventType(u"t_comment_create", pri=3,  
    130130                          subject=lambda: _(u"New comment: in %(topic)s"), 
    131131                          link_path=lambda e: h.entity_url(e.comment), 
    … …  
    133133                          text=lambda e: e.rev.text if e.rev else None) 
    134134 
    135 T_COMMENT_EDIT = EventType(u"t_comment_edit", pri=1,  
     135T_COMMENT_EDIT = EventType(u"t_comment_edit", pri=3,  
    136136                          subject=lambda: _(u"Edited comment: in %(topic)s"), 
    137137                          link_path=lambda e: h.entity_url(e.comment), 
    … …  
    139139                          text=lambda e: e.rev.text if e.rev else None) 
    140140 
    141 T_COMMENT_DELETE = EventType(u"t_comment_delete", pri=2,  
     141T_COMMENT_DELETE = EventType(u"t_comment_delete", pri=3,  
    142142                          subject=lambda: _(u"Deleted comment: in %(topic)s"), 
    143143                          link_path=lambda e: h.entity_url(e.topic), 
    … …  
    164164                          event_msg=lambda: _(u"is %(vote)s %(poll)s")) 
    165165 
    166  
    167166T_SELECT_VARIANT = EventType(u"t_select_variant", pri=2,  
    168167                        subject=lambda: _(u"Variants: %(user)s %(vote)s %(poll)s"), 
    … …  
    170169                        event_msg=lambda: _(u"is %(vote)s %(poll)s")) 
    171170 
    172  
    173171T_TEST = EventType(u"t_test", pri=5,  
    174172                          subject=lambda: _(u"Adhocracy says hello: %(test)s"), 
    … …  
    196194                          notify_self=True) 
    197195 
    198 N_SELF_VOTED = NotificationType("n_self_voted", pri=3,  
     196N_SELF_VOTED = NotificationType("n_self_voted", pri=2,  
    199197                          subject=lambda: _(u"You have voted %(vote)s %(poll)s"), 
    200198                          link_path=lambda e: h.entity_url(e.poll.subject), 
    201199                          notify_self=True) 
    202200 
    203 N_DELEGATE_VOTED = NotificationType("n_delegate_voted", pri=4,  
     201N_DELEGATE_VOTED = NotificationType("n_delegate_voted", pri=2,  
    204202                          subject=lambda: _(u"Your delegate %(agent)s has voted %(vote)s %(poll)s"), 
    205203                          link_path=lambda e: h.entity_url(e.poll.subject), 

  • adhocracy/lib/helpers.py

    r669 r744  
    7777        return proposal_link(delegateable, icon=icon, icon_size=icon_size, link=link) 
    7878    elif isinstance(delegateable, model.Page): 
    79         return page_link(delegateable, link=link) 
     79        return page_link(delegateable, icon=icon, icon_size=icon_size, link=link) 
    8080    return cgi.escape(delegateable.label) 
    8181 

  • adhocracy/lib/url.py

    r742 r744  
    3030 
    3131 
    32 def _common_url_builder(instance, base, id, **kwargs): 
     32def _common_url_builder(instance, base, id, query=None, **kwargs): 
    3333    url = instance_url(instance, path=u'/' + base + u'/' + unicode(id)) 
    34     return _append_member_and_format(url, **kwargs).encode('utf-8') 
     34    url = _append_member_and_format(url, **kwargs) 
     35    if query is not None: 
     36        url = url + u'?' + unicode(urllib.urlencode(query)) 
     37    return url.encode('utf-8') 
    3538 
    3639 

  • adhocracy/model/page.py

    r742 r744  
    2121class Page(Delegateable): 
    2222     
    23     DOCUMENT = "document" 
    24     DESCRIPTION = "description" 
    25     NORM = "norm" 
     23    DOCUMENT = u"document" 
     24    DESCRIPTION = u"description" 
     25    NORM = u"norm" 
    2626     
    2727    FUNCTIONS = [DOCUMENT, DESCRIPTION, NORM] 

  • adhocracy/model/text.py

    r675 r744  
    2626class Text(object): 
    2727     
    28     HEAD = 'HEAD' 
     28    HEAD = u'HEAD' 
    2929     
    3030    def __init__(self, page, variant, user, title, text): 

  • adhocracy/templates/comment/ask_delete.html

    r439 r744  
    88 
    99<h1 class="page_title"><img src="/img/icons/discuss_24.png" class="cd" />  
    10         ${_("Comment on %s") % h.delegateable_link(c.comment.topic)|n}</h1> 
     10        ${_("Comment on %s") % h.delegateable_link(c.comment.topic, icon_size=24)|n}</h1> 
    1111 
    1212<form name="ask_delete" class="inplace" method="POST"  

  • adhocracy/templates/instance/show.html

    r702 r744  
    1515         
    1616        <h3 class="help">${_("Help")}</h3> 
    17         <p>${_("There are help pages on several help topics:")}</p> 
     17        <p>${_("There are many help pages:")}</p> 
    1818        <ul> 
    1919                <li>${h.help_link(_("General intro"), "about")|n}</a> ${_("on Liquid Democracy")}</li> 

  • adhocracy/templates/notifications/n_self_voted.de.txt

    r424 r744  
    11<%namespace name="common" file="/notifications/common.txt"/> 
    22 
    3 Diese Nachricht bestŠtigt Ihre Stimme an ${e.poll.scope.label}. Sie wŠhlten ${common.vote(e.vote)} den Vorschlag.   
     3Diese Nachricht bestÀtigt Deine Stimme unter ${e.poll.scope.title}.  
    44 
    5 Wenn Sie Ihre Abstimmung Ÿberdenken wollen, besuchen Sie die Abstimmungsseite. 
     5Wenn Du Deine Abstimmung ÃŒberdenken willst, besuche die Abstimmungsseite. 

  • adhocracy/templates/notifications/t_delegation_create.en.txt

    r168 r744  
    1 ${e.user.name|n} has delegated voting on ${e.scope.label|n} to ${e.agent.name|n}. 
     1${e.user.name|n} has delegated voting on ${e.scope.title|n} to ${e.agent.name|n}. 
    22 
    33Delegate page: ${h.instance_url(None, path="/user/%s" % e.agent.user_name)} 

  • adhocracy/templates/notifications/t_delegation_revoke.de.txt

    r430 r744  
    1 ${e.user.name|n} entzog ${e.agent.name|n} die Delegation auf ${e.scope.label|n}. 
     1${e.user.name|n} entzog ${e.agent.name|n} die Delegation auf ${e.scope.title|n}. 
    22 
    33User-Seite: ${h.instance_url(None, path="/user/%s" % e.agent.user_name)} 

  • adhocracy/templates/notifications/t_delegation_revoke.en.txt

    r168 r744  
    1 ${e.user.name|n} has revoked their delegation to ${e.agent.name|n} on ${e.scope.label|n}. 
     1${e.user.name|n} has revoked their delegation to ${e.agent.name|n} on ${e.scope.title|n}. 
    22 
    33Delegate page: ${h.instance_url(None, path="/user/%s" % e.agent.user_name)} 

  • adhocracy/templates/notifications/t_proposal_state_voting.de.txt

    r631 r744  
    1 ${e.user.name} hat eine Abstimmung fŸr den Vorschlag ${e.proposal.title} initiiert.   
     1${e.user.name} hat eine Abstimmung fÃŒr den Vorschlag ${e.proposal.title} initiiert.   
    22 
    3 Wenn Sie mšchten geben Sie Ihre Stimme ab oder ŸberprŸfen Sie, ob Sie Ihre Stimme passend zu dem Thema delegiert haben. 
     3Wenn Du möchtest, gib Deine Stimme ab oder ÃŒberprÃŒfe, ob Du Deine Stimme passend zu dem Thema delegiert hast. 

  • adhocracy/templates/notifications/t_user_admin_edit.de.txt

    r424 r744  
    1 ${e.admin.name} hat ads Profil von ${e.user.name} aktualisiert.  
     1${e.admin.name} hat das Profil von ${e.user.name} aktualisiert.  
    22%if e.user.bio:  
    33User bio:  

  • adhocracy/templates/page/diff.html

    r692 r744  
    2222        %else: 
    2323                %if c.right.page.function == c.right.page.NORM: 
    24                         ${_("This topic has not yet been decided and is thus no official position of this group.")} 
     24                        ${_("This norm has not yet been decided and is thus no official position of this group.")} 
    2525                %elif c.right.text == c.left.text: 
    2626                        ${_("Both texts are identical.")} 

  • adhocracy/templates/page/diff_edit.html

    r690 r744  
    44<%def name="title()">${_("Variant: %s") % c.text.title}</%def> 
    55 
    6 <%def name="breadcrumbs()">${h.breadcrumbs(c.text)|n}</%def> 
     6<%def name="breadcrumbs()">${h.breadcrumbs(c.text)|n} &raquo; ${_("Edit variant")}</%def> 
    77 
    88<form name="edit_page" class="inplace" method="POST" action="${h.entity_url(c.page)}"> 
    99        ${h.field_token()|n} 
    1010        <input type="hidden" name="parent_text" value="${c.text.id}" /> 
     11        <input type="hidden" name="title" value="${c.text.title}"/> 
    1112        %if c.proposal: 
    1213                <input type="hidden" value="${c.proposal}" name="proposal" /> 
    1314        %endif 
    1415        <input type="hidden" name="_method" value="PUT" />  
    15         <div class="page_title"> 
    16                 <label for="title" class="armhint">${_("New Variant")}</label> 
    17                 <input tabindex="1" class="title armlabel" name="title" value="${c.text.title}"/> 
    18         </div> 
    1916         
     17        ${tiles.page.header(c.text.page, c.tile, active='diff', text=c.text, variant=c.variant)} 
    2018 
    2119        <div class="lefthalf double"> 
    … …  
    3432                %else: 
    3533                        <div class="infobox"> 
    36                                 ${_("This topic has no text yet.")} 
     34                                ${_("This norm has no text yet.")} 
    3735                        </div> 
    3836                %endif 

  • adhocracy/templates/page/new.html

    r690 r744  
    2121                        <label for="norm">${_("Document type:")}</label><br/> 
    2222                        <input type="radio" value="document" name="function" checked="checked" /> ${_("Wiki page")}<br/> 
    23                         <input type="radio" value="norm" name="function" /> ${_("Topic page")}<br/> 
     23                        <input type="radio" value="norm" name="function" /> ${_("Norm page")}<br/> 
    2424                        <br/> 
    2525                        <div class="infobox"> 
    26                                 ${_("Topics can only be edited by including variants of them in proposals and voting on them.")} 
     26                                ${_("Norms can only be edited by including variants of them in proposals and voting on them.")} 
    2727                        </div> 
    2828                %else: 

  • adhocracy/templates/page/tiles.html

    r696 r744  
    9090        %if text.variant != text.HEAD: 
    9191                <img class="cd" src="/img/icons/page_variant_24.png" /> 
    92                 ${_("Topic: %s") % text.title} 
     92                ${_("Norm: %s") % text.title} 
    9393        %else: 
    9494                <img class="cd" src="${h.page_icon(page, size=24)|n}" /> 

  • adhocracy/templates/proposal/tiles.html

    r721 r744  
    2323                                %endif 
    2424                                <img src="/img/icons/page_variant_16.png" />  
    25                                 ${ungettext("%s topic", "%s topics", len(proposal.selections)) % len(proposal.selections)} 
     25                                ${ungettext("%s norm", "%s norms", len(proposal.selections)) % len(proposal.selections)} 
    2626                                &middot; 
    2727                                <img src="/img/icons/discuss_16.png" />  
    … …  
    8787                 
    8888                %if can.selection.create(proposal): 
    89                         <a class="button title add ttip" title="${_('Propose to change a topic through this proposal.')}"  
     89                        <a class="button title add ttip" title="${_('Propose to change a norm through this proposal.')}"  
    9090                           href="${h.entity_url(proposal, member='implementation/new')}">${_("amend implementation")}</a> 
    9191                %endif           

  • adhocracy/templates/selection/ask_delete.html

    r690 r744  
    1919        <div class="mainbar"> 
    2020                <div class="warning_box"> 
    21                         ${_("Are you sure you want to delete the topic %s from this proposal?") % c.selection.page.title|n} 
     21                        ${_("Are you sure you want to delete the norm %s from this proposal?") % c.selection.page.title|n} 
    2222                </div> 
    2323                <center> 

  • adhocracy/templates/selection/index.html

    r702 r744  
    2020        <h3 class="help">${_("Help")}</h3> 
    2121        <ul> 
    22                 <li>${h.help_link(_("What is a topic?"), 'selection_faq', anchor='whatisnorm')|n}</li> 
     22                <li>${h.help_link(_("What is a norm?"), 'selection_faq', anchor='whatisnorm')|n}</li> 
    2323                <li>${h.help_link(_("What is a variant?"), 'selection_faq', anchor='whatisvariant')|n}</li> 
    2424                <li>${h.help_link(_("What does 'Status quo' mean?"), 'selection_faq', anchor='whatishead')|n}</li> 
    … …  
    3232        %if not len(c.proposal.selections): 
    3333                <div class="infobox"> 
    34                         ${_("Proposals are implemented by including changes towards new or existing topic. Amend the proposal to change or create a topic.")}  
     34                        ${_("Proposals are implemented by including changes towards new or existing norm. Amend the proposal to change or create a norm.")}  
    3535                </div> 
    3636                <br/> 
    … …  
    4242        %if can.selection.create(c.proposal): 
    4343        <div class="top_actions"> 
    44                 <a class="button add ttip" title="${_('Propose to change a topic through this proposal.')}"  
     44                <a class="button add ttip" title="${_('Propose to change a norm through this proposal.')}"  
    4545                   href="${h.entity_url(c.proposal, member='implementation/new')}">${_("amend implementation")}</a> 
    4646        </div> 

  • adhocracy/templates/selection/new.html

    r690 r744  
    1313        <h3 class="help">${_("Help")}</h3> 
    1414        <div class="infobox"> 
    15                 ${_("The implementation of a proposal is amended by relating to a fixed document, a topic. Please select or create the topic that you want to relate to. You can then add a text variant of that topic, specifying the change you want to implement.")} 
     15                ${_("The implementation of a proposal is amended by relating to a fixed document, a norm. Please select or create the norm that you want to relate to. You can then add a text variant of that norm, specifying the change you want to implement.")} 
    1616        </div> 
    1717        <br/> 
    1818        <ul> 
    19                 <li>${h.help_link(_("What is a topic?"), 'selection_faq', anchor='whatisnorm')|n}</li> 
     19                <li>${h.help_link(_("What is a norm?"), 'selection_faq', anchor='whatisnorm')|n}</li> 
    2020                <li>${h.help_link(_("What is a variant?"), 'selection_faq', anchor='whatisvariant')|n}</li> 
    2121                <li>${h.help_link(_("What does 'Status quo' mean?"), 'selection_faq', anchor='whatishead')|n}</li> 
    … …  
    3333 
    3434        <div id="accordion"> 
    35                 <h3><a href="#">${_("I want to include a change to an existing topic.")|n}</a></h3> 
     35                <h3><a href="#">${_("I want to include a change to an existing norm.")|n}</a></h3> 
    3636                <form name="create_selection" class="inplace" method="POST"  
    3737                      action="${h.entity_url(c.proposal, member='implementation')}"> 
    … …  
    4343                </form> 
    4444 
    45                 <h3><a href="#">${_("I want to propose the creation of a new topic.")|n}</a></h3> 
     45                <h3><a href="#">${_("I want to propose the creation of a new norm.")|n}</a></h3> 
    4646                <form name="create_page" class="inplace" method="POST" action="/page"> 
    4747                        ${h.field_token()|n} 
    … …  
    5151                        <input type="hidden" value="" name="tags" /> 
    5252                        <div class="page_title"> 
    53                                 <label for="title" class="armhint">${_("New topic title")}</label> 
     53                                <label for="title" class="armhint">${_("New norm title")}</label> 
    5454                                <input tabindex="1" class="title armlabel" name="title" value=""/> 
    5555                        </div> 
    … …  
    5757                        <label for="parent">${_("Parent page:")}</label> 
    5858                        ${tiles.page.select_page(field_name="parent", functions=c.model.Page.PARENT_FUNCTIONS)} 
    59                         <span class="hint">${_("The new topic will be categorized under the specified parent page.")} 
     59                        <span class="hint">${_("The new norm will be categorized under the specified parent page.")} 
    6060                                ${h.help_link(_("Help."), 'selection_faq', anchor='parent')|n} 
    6161                        </span> 

  • adhocracy/templates/selection/show.html

    r702 r744  
    1616        <h3 class="help">${_("Help")}</h3> 
    1717        <div class="infobox"> 
    18                 ${_("Select which text variant of the topic should be included in this proposal.")} 
     18                ${_("Select which text variant of the norm should be included in this proposal.")} 
    1919        </div> 
    2020        <ul> 
    21                 <li>${h.help_link(_("What is a topic?"), 'selection_faq', anchor='whatisnorm')|n}</li> 
     21                <li>${h.help_link(_("What is a norm?"), 'selection_faq', anchor='whatisnorm')|n}</li> 
    2222                <li>${h.help_link(_("What is a variant?"), 'selection_faq', anchor='whatisvariant')|n}</li> 
    2323                <li>${h.help_link(_("What does 'Status quo' mean?"), 'selection_faq', anchor='whatishead')|n}</li> 
    … …  
    4040                        ${h.page_link(c.selection.page, icon_size=24)|n}  
    4141                        %if not c.selection.page.head.has_text: 
    42                                 ${_("(new)")} 
     42                                ${_("(initiative)")} 
     43                        %else: 
     44                                ${_("(change)")} 
    4345                        %endif 
    4446                </h3> 
    … …  
    8688                                        %if row.text.is_head: 
    8789                                                <b><a href="${h.entity_url(row.text)}">${_("Status quo")}</a></b> 
    88                                                 ${_("(this proposal should not change this topic)")} 
     90                                                ${_("(this proposal should not change this norm)")} 
    8991                                        %else: 
    9092                                                <b><a href="${h.entity_url(row.text)}">${row.variant}</a></b> 
    … …  
    106108                                %elif row.selected: 
    107109                                        <div class="infobox"> 
    108                                                 ${_("Status quo has the most votes, resulting in no proposed change to this topic.")} 
     110                                                ${_("Status quo has the most votes, resulting in no proposed change to this norm.")} 
    109111                                        </div> 
    110112                                %endif 

  • adhocracy/templates/selection/tiles.html

    r690 r744  
    88                        <!--/a--> 
    99                        %if not selection.page.head.has_text: 
    10                                 ${_("(new)")} 
     10                                ${_("(initiative)")} 
     11                        %else: 
     12                                ${_("(change)")} 
    1113                        %endif 
    1214                </h3> 
    … …  
    1921                        %elif tile.selected_text.is_head: 
    2022                                <div class="infobox"> 
    21                                         ${_("Status quo has the most votes, resulting in no proposed change to this topic.")} 
     23                                        ${_("Status quo has the most votes, resulting in no proposed change to this norm.")} 
    2224                                </div> 
    2325                        %else: 
    … …  
    3638                                        <a class="button add" href="${h.entity_url(selection.page, member='%20/edit')}?proposal=${c.proposal.id}">${_("new variant")}</a>  
    3739                                %else: 
    38                                         <a class="button edit" href="${h.entity_url(selection.page)}">${_("see topic")}</a> 
     40                                        <a class="button edit" href="${h.entity_url(selection.page)}">${_("see norm")}</a> 
    3941                                %endif 
    4042                        %else: 
    … …  
    5052                </div> 
    5153                <div class="meta noclear"> 
    52                         ${_("There are %s of the topic %s.") % ("<a href='%s'>%s</a>" % (h.entity_url(selection), ungettext("%s variant", "%s variants", tile.num_variants) % tile.num_variants), escape(selection.page.title))|n} 
     54                        ${_("There are %s of the norm %s.") % ("<a href='%s'>%s</a>" % (h.entity_url(selection), ungettext("%s variant", "%s variants", tile.num_variants) % tile.num_variants), escape(selection.page.title))|n} 
    5355                </div> 
    5456                <br/> 

  • adhocracy/templates/template.html

    r719 r744  
    8686                                <li><a class="ttip" title="${_('Show all proposals')}"  
    8787                                             href="/proposal">${_("Proposals")}</a></li> 
    88                                 <li><a class="ttip" title="${_('Topics and wiki pages')}"  
     88                                <li><a class="ttip" title="${_('Norms and wiki pages')}"  
    8989                                             href="/page/Main_Page">${_("Documents")}</a></li> 
    9090                                <!--li><a href="/tag">${_("Topics")}</a></li--> 

  • adhocracy/templates/text/tiles.html

    r696 r744  
    3737                <div class="infobox"> 
    3838                        %if text.page.function == text.page.NORM: 
    39                                 ${_("This topic has not yet been decided and is thus no official position of this group.")} 
     39                                ${_("This norm has not yet been decided and is thus no official position of this group.")} 
    4040                        %else: 
    4141                                ${_("This document has no text yet.")} 
Note: See TracChangeset for help on using the changeset viewer.