Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrated Setup and Profiles from senaite.lims #1536

Merged
merged 7 commits into from
Feb 13, 2020
Merged

Integrated Setup and Profiles from senaite.lims #1536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
753e31d
Moved and cleaned up action profile
ramonski Feb 13, 2020
59437a6
Moved portal languages into core
ramonski Feb 13, 2020
2d5c10a
Moved navigation portlet
ramonski Feb 13, 2020
b01a807
Moved html filter setup to core
ramonski Feb 13, 2020
3ebad52
Changelog updated
ramonski Feb 13, 2020
b9cd251
Fixed chinese language code
ramonski Feb 13, 2020
1af8d3a
Import from profile: languagetool
xispa Feb 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Changelog

**Added**

- #1536 Integrated Setup and Profiles from senaite.lims
- #1534 Integrate browser resources from senaite.lims
- #1529 Moved contentmenu provider into core
- #1523 Moved Installation Screens into core
Expand Down
251 changes: 96 additions & 155 deletions bika/lims/profiles/default/actions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
<?xml version="1.0"?>
<object xmlns:i18n="http://xml.zope.org/namespaces/i18n"
name="portal_actions"
meta_type="Plone Actions Tool"
purge="True">
name="portal_actions"
meta_type="Plone Actions Tool"
purge="True">

<action-provider name="portal_actions"/>

<!-- hide the "sharing" tab on a list of types.
This is here to avoid hiding the sharing tab globally -->

<object name="object" meta_type="CMF Action Category" purge="True">
<property name="title"/>
<object name="local_roles" meta_type="CMF Action" i18n:domain="plone">
<property name="title" i18n:translate="">Sharing</property>
<property name="description" i18n:translate=""/>
<property name="url_expr">string:${object_url}/@@sharing</property>
<property name="link_target"/>
<property name="icon_expr"/>
<property name="available_expr">python:here.portal_type not in ['Client', 'ClientFolder']</property>
<property name="permissions"/>
<property name="visible">False</property>
</object>
<!-- Object actions -->
<object name="object" meta_type="CMF Action Category" purge="True">
<!-- hide the "sharing" tab on a list of types.
This is here to avoid hiding the sharing tab globally -->
<object name="local_roles" meta_type="CMF Action" i18n:domain="plone">
<property name="title" i18n:translate="">Sharing</property>
<property name="description" i18n:translate=""/>
<property name="url_expr">string:${object_url}/@@sharing</property>
<property name="link_target"/>
<property name="icon_expr"/>
<property name="available_expr">python:here.portal_type not in ['Client', 'ClientFolder']</property>
<property name="permissions"/>
<property name="visible">False</property>
</object>
<!-- Audit Log -->
<object name="auditlog" meta_type="CMF Action" i18n:domain="senaite.core">
<property name="title" i18n:translate="">Audit Log</property>
Expand All @@ -34,131 +31,75 @@
</property>
<property name="visible">True</property>
</object>
</object>
</object>

<object name="portal_tabs" meta_type="CMF Action Category" purge="True">
<property name="title"/>
<object name="index_html" meta_type="CMF Action" i18n:domain="plone">
<property name="title" i18n:translate="">Home</property>
<property name="description" i18n:translate=""/>
<property name="url_expr">string:${globals_view/navigationRootUrl}</property>
<property name="link_target"/>
<property name="icon_expr"/>
<property name="available_expr"/>
<property name="permissions">
<element value="View"/>
</property>
<property name="visible">False</property>
</object>
<object name="front-page" meta_type="CMF Action" i18n:domain="plone">
<property name="title" i18n:translate="">Home</property>
<property name="description" i18n:translate=""/>
<property name="url_expr">string:${globals_view/navigationRootUrl}</property>
<property name="link_target"/>
<property name="icon_expr"/>
<property name="available_expr"/>
<property name="permissions">
<element value="View"/>
</property>
<property name="visible">False</property>
</object>
<object name="analysisrequests" meta_type="CMF Action" i18n:domain="plone">
<property name="title" i18n:translate="">Samples</property>
<property name="description" i18n:translate=""/>
<property name="url_expr">string:$portal_url/analysisrequests</property>
<property name="link_target"/>
<property name="icon_expr"/>
<property name="available_expr"/>
<property name="permissions">
<element value="senaite.core: Manage Analysis Requests"/>
</property>
<property name="visible">False</property>
</object>
<object name="worksheets" meta_type="CMF Action" i18n:domain="plone">
<property name="title" i18n:translate="">Worksheets</property>
<property name="description" i18n:translate=""/>
<property name="url_expr">string:$portal_url/worksheets</property>
<property name="link_target"/>
<property name="icon_expr"/>
<property name="available_expr"/>
<property name="permissions">
<element value="senaite.core: Manage Worksheets"/>
</property>
<property name="visible">False</property>
</object>
<object name="suppliers" meta_type="CMF Action" i18n:domain="plone">
<property name="title" i18n:translate="">Suppliers</property>
<property name="description" i18n:translate=""/>
<property name="url_expr">string:$portal_url/suppliers</property>
<property name="link_target"/>
<property name="icon_expr"/>
<property name="available_expr"/>
<property name="permissions">
<element value="senaite.core: Manage Reference Suppliers"/>
</property>
<property name="visible">False</property>
</object>
<object name="referencesamples" meta_type="CMF Action" i18n:domain="plone">
<property name="title" i18n:translate="">Reference Samples</property>
<property name="description" i18n:translate=""/>
<property name="url_expr">string:$portal_url/referencesamples</property>
<property name="link_target"/>
<property name="icon_expr"/>
<property name="available_expr"/>
<property name="permissions">
<element value="senaite.core: Manage Reference"/>
</property>
<property name="visible">False</property>
</object>
<object name="extracts" meta_type="CMF Action" i18n:domain="plone">
<property name="title" i18n:translate="">Extracts</property>
<property name="description" i18n:translate=""/>
<property name="url_expr">string:$portal_url/extracts</property>
<property name="link_target"/>
<property name="icon_expr"/>
<property name="available_expr"/>
<property name="permissions">
<element value="List portal members"/>
</property>
<property name="visible">False</property>
</object>
<object name="reset_services" meta_type="CMF Action" i18n:domain="plone">
<property name="title" i18n:translate="">Prices</property>
<property name="description" i18n:translate=""/>
<property name="url_expr">string:$portal_url/setanalyses</property>
<property name="link_target"/>
<property name="icon_expr"/>
<property name="available_expr"/>
<property name="permissions">
<element value="List portal members"/>
</property>
<property name="visible">False</property>
</object>
<object name="reports" meta_type="CMF Action" i18n:domain="plone">
<property name="title" i18n:translate="">Report</property>
<property name="description" i18n:translate=""/>
<property name="url_expr">string:$portal_url/reports</property>
<property name="link_target"/>
<property name="icon_expr"/>
<property name="available_expr"/>
<property name="permissions">
<element value="List portal members"/>
</property>
<property name="visible">True</property>
</object>
<object name="import" meta_type="CMF Action" i18n:domain="plone">
<property name="title" i18n:translate="">Import</property>
<property name="description" i18n:translate=""/>
<property name="url_expr">string:$portal_url/import</property>
<property name="link_target"/>
<property name="icon_expr"/>
<property name="available_expr"/>
<property name="permissions">
<element value="senaite.core: Import Instrument Results"/>
</property>
<property name="visible">True</property>
</object>
<!-- Search -->
<!-- Folder Buttons -->
<object name="folder_buttons">
<object name="copy">
<property name="visible">False</property>
</object>
<object name="cut">
<property name="visible">False</property>
</object>
<object name="paste">
<property name="visible">False</property>
</object>
<object name="delete">
<property name="visible">False</property>
</object>
<object name="rename">
<property name="visible">False</property>
</object>
</object>

<!-- Object Buttons -->
<object name="object_buttons">
<object name="copy">
<property name="visible">False</property>
</object>
<object name="cut">
<property name="visible">False</property>
</object>
<object name="paste">
<property name="visible">False</property>
</object>
<object name="delete">
<property name="visible">False</property>
</object>
<object name="rename">
<property name="visible">False</property>
</object>
</object>

<!-- Portal Tabs (Located in the upper right button) -->
<object name="portal_tabs" meta_type="CMF Action Category" purge="True">
<!-- Reports -->
<object name="reports" meta_type="CMF Action" i18n:domain="plone">
<property name="title" i18n:translate="">Report</property>
<property name="description" i18n:translate=""/>
<property name="url_expr">string:$portal_url/reports</property>
<property name="link_target"/>
<property name="icon_expr"/>
<property name="available_expr"/>
<property name="permissions">
<element value="senaite.core: Manage Analysis Requests"/>
</property>
<property name="visible">True</property>
</object>
<!-- Import -->
<object name="import" meta_type="CMF Action" i18n:domain="plone">
<property name="title" i18n:translate="">Import</property>
<property name="description" i18n:translate=""/>
<property name="url_expr">string:$portal_url/import</property>
<property name="link_target"/>
<property name="icon_expr"/>
<property name="available_expr"/>
<property name="permissions">
<element value="senaite.core: Import Instrument Results"/>
</property>
<property name="visible">True</property>
</object>
<!-- Spotlight Search View -->
<object name="spotlight_search" meta_type="CMF Action" i18n:domain="plone">
<property name="title" i18n:translate="">Search</property>
<property name="description" i18n:translate=""/>
Expand All @@ -172,17 +113,17 @@
<property name="visible">True</property>
</object>
<!-- Audit Log -->
<object name="auditlog" meta_type="CMF Action" i18n:domain="plone">
<property name="title" i18n:translate="">Audit Log</property>
<property name="description" i18n:translate=""/>
<property name="url_expr">string:$portal_url/bika_setup/auditlog</property>
<property name="link_target"/>
<property name="icon_expr"/>
<property name="available_expr"/>
<property name="permissions">
<element value="senaite.core: View Log Tab"/>
</property>
<property name="visible">True</property>
<object name="auditlog" meta_type="CMF Action" i18n:domain="plone">
<property name="title" i18n:translate="">Audit Log</property>
<property name="description" i18n:translate=""/>
<property name="url_expr">string:$portal_url/bika_setup/auditlog</property>
<property name="link_target"/>
<property name="icon_expr"/>
<property name="available_expr"/>
<property name="permissions">
<element value="senaite.core: View Log Tab"/>
</property>
<property name="visible">True</property>
</object>
</object>
</object>
55 changes: 20 additions & 35 deletions bika/lims/profiles/default/portal_languages.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,23 @@
<?xml version="1.0"?>
<object>
<default_language value="en"/>
<use_path_negotiation value="False"/>
<use_cookie_negotiation value="False"/>
<set_cookie_everywhere value="False"/>
<use_request_negotiation value="True"/>
<use_cctld_negotiation value="False"/>
<use_content_negotiation value="False"/>
<use_combined_language_codes value="True"/>
<display_flags value="False"/>
<start_neutral value="False"/>
<use_subdomain_negotiation value="False"/>
<authenticated_users_only value="False"/>
<supported_langs>
<element value="af"/>
<element value="bn"/>
<element value="ca"/>
<element value="zh"/>
<element value="nl"/>
<element value="en"/>
<element value="fr"/>
<element value="de"/>
<element value="el"/>
<element value="hi"/>
<element value="id"/>
<element value="it"/>
<element value="ja"/>
<element value="kn"/>
<element value="pl"/>
<element value="pt"/>
<element value="ru"/>
<element value="es"/>
<element value="ta"/>
<element value="uk"/>
<element value="ur"/>
</supported_langs>
<default_language value="en"/>
<use_path_negotiation value="False"/>
<use_cookie_negotiation value="True"/>
<set_cookie_everywhere value="False"/>
<use_request_negotiation value="True"/>
<use_cctld_negotiation value="False"/>
<use_content_negotiation value="False"/>
<use_combined_language_codes value="True"/>
<display_flags value="False"/>
<start_neutral value="False"/>
<use_subdomain_negotiation value="False"/>
<authenticated_users_only value="False"/>
<supported_langs>
<element value="de"/>
<element value="en"/>
<element value="es"/>
<element value="pl"/>
<element value="th"/>
<element value="zh"/>
</supported_langs>
</object>
16 changes: 6 additions & 10 deletions bika/lims/profiles/default/portlets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
<?xml version="1.0"?>
<portlets
xmlns:i18n="http://xml.zope.org/namespaces/i18n"
i18n:domain="plone">
xmlns:i18n="http://xml.zope.org/namespaces/i18n"
i18n:domain="plone">

<assignment
name="navigation"
category="context"
key="/"
manager="plone.leftcolumn"
type="portlets.Navigation"
visible="True">
<!-- Navigation Portlet -->
<assignment name="navigation" category="context" key="/"
manager="plone.leftcolumn" type="portlets.Navigation" visible="True">
<property name="topLevel">0</property>
<property name="currentFolderOnly">False</property>
<property name="name">Navigation</property>
<property name="includeTop">True</property>
<property name="includeTop">False</property>
<property name="bottomLevel">0</property>
<property name="root"/>
</assignment>
Expand Down
Loading