ajung/plone.app.discussion
ajung/plone.app.discussion
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #75 from plone/fix_sitesetup_link

Browse Source 
Update Site Setup link in all control panels
This commit is contained in:
Gil Forcada Codinachs 2015-11-25 01:39:33 +01:00
commit a2439609c6
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.rst
View File

@ -10,6 +10,9 @@ New:
Fixes: Fixes:
- Update Site Setup link in all control panels (fixes https://github.com/plone/Products.CMFPlone/issues/1255)
[davilima6]
- Move translations to plone.app.locales - Move translations to plone.app.locales
https://github.com/plone/plone.app.discussion/issues/66 https://github.com/plone/plone.app.discussion/issues/66
[gforcada] [gforcada]

8
plone/app/discussion/browser/controlpanel.pt
View File

@ -5,13 +5,11 @@
lang="en" lang="en"
metal:use-macro="here/prefs_main_template/macros/master" metal:use-macro="here/prefs_main_template/macros/master"
i18n:domain="plone"> i18n:domain="plone">
<body> <body>
<article id="content" <article id="content"
tal:attributes="class view/settings" tal:attributes="class view/settings"
metal:fill-slot="prefs_configlet_content"> metal:fill-slot="prefs_configlet_content">
<div class="portalMessage warning" <div class="portalMessage warning"
tal:condition="view/mailhost_warning"> tal:condition="view/mailhost_warning">
<strong i18n:translate=""> <strong i18n:translate="">
@ -74,9 +72,8 @@
Portal status message Portal status message
</div> </div>
<a href="" <a id="setup-link" class="link-parent"
id="setup-link" tal:attributes="href string:$portal_url/@@overview-controlpanel"
tal:attributes="href string:$portal_url/plone_control_panel"
i18n:translate=""> i18n:translate="">
Site Setup Site Setup
</a> </a>
@ -92,6 +89,7 @@
<script type="text/javascript" <script type="text/javascript"
tal:attributes="src string:${context/portal_url}/++resource++plone.app.discussion.javascripts/controlpanel.js"> tal:attributes="src string:${context/portal_url}/++resource++plone.app.discussion.javascripts/controlpanel.js">
</script> </script>
</article> </article>
</body> </body>
</html> </html>

2
plone/app/discussion/tests/functional_test_comments.txt
View File

@ -262,7 +262,7 @@ Log in as admin
Use the Plone control panel to enable comment editing. Use the Plone control panel to enable comment editing.
>>> browser.open(portal_url + '/plone_control_panel') >>> browser.open(portal_url + '/@@overview-controlpanel')
>>> browser.getLink('Discussion').click() >>> browser.getLink('Discussion').click()
>>> browser.getControl('Enable editing of comments').selected = True >>> browser.getControl('Enable editing of comments').selected = True
>>> browser.getControl(name='form.buttons.save').click() >>> browser.getControl(name='form.buttons.save').click()