From f0de88bdc2debec91ef1bff0e88dbfd5e9669f96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Vir=C3=A1g?= <martin.virag@eea.sk>
Date: Fri, 11 Sep 2015 13:51:23 +0200
Subject: [PATCH] [#8] theme split for IC and PC

- each has own plugin: odn_theme_ic, odn_theme_pc
- added template css for each catalog
- displaying actor name in header moved from "base" theme to IC theme plugin
- added change log file
---
 CHANGELOG.rst                                 |  8 ++++
 README.md                                     |  2 +-
 ckanext/odn_theme/templates/base.html         |  7 +---
 ckanext/odn_theme/templates/header.html       | 38 ------------------
 ckanext/odn_theme_ic/__init__.py              |  7 ++++
 ckanext/odn_theme_ic/plugin.py                | 16 ++++++++
 .../odn_theme_ic/public/css/odn_theme_ic.css  |  0
 ckanext/odn_theme_ic/templates/base.html      |  9 +++++
 ckanext/odn_theme_ic/templates/header.html    | 39 +++++++++++++++++++
 ckanext/odn_theme_pc/__init__.py              |  7 ++++
 ckanext/odn_theme_pc/plugin.py                | 16 ++++++++
 .../odn_theme_pc/public/css/odn_theme_pc.css  |  0
 ckanext/odn_theme_pc/templates/base.html      |  9 +++++
 setup.py                                      |  8 +++-
 14 files changed, 120 insertions(+), 46 deletions(-)
 create mode 100644 CHANGELOG.rst
 create mode 100644 ckanext/odn_theme_ic/__init__.py
 create mode 100644 ckanext/odn_theme_ic/plugin.py
 create mode 100644 ckanext/odn_theme_ic/public/css/odn_theme_ic.css
 create mode 100644 ckanext/odn_theme_ic/templates/base.html
 create mode 100644 ckanext/odn_theme_ic/templates/header.html
 create mode 100644 ckanext/odn_theme_pc/__init__.py
 create mode 100644 ckanext/odn_theme_pc/plugin.py
 create mode 100644 ckanext/odn_theme_pc/public/css/odn_theme_pc.css
 create mode 100644 ckanext/odn_theme_pc/templates/base.html

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
new file mode 100644
index 0000000..1dc5416
--- /dev/null
+++ b/CHANGELOG.rst
@@ -0,0 +1,8 @@
+---------
+Changelog
+---------
+
+v1.2.0-SNAPSHOT 2015-9-11
+
+Features:
+ * added plugins for Internal and Public Catalog themes, where the odn_theme plugin is a common base
diff --git a/README.md b/README.md
index a6d44e1..d89b3ec 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Installation
 
 To enable plugin, change property in your production.ini:
 ```
-ckan.plugins = odn_theme odn_package_extras
+ckan.plugins = odn_theme odn_theme_ic odn_theme_pc odn_package_extras
 
 # version displayed in header and About page (current version)
 ckan.odn_version = 1.0.2
diff --git a/ckanext/odn_theme/templates/base.html b/ckanext/odn_theme/templates/base.html
index 0f92ec3..6117d30 100644
--- a/ckanext/odn_theme/templates/base.html
+++ b/ckanext/odn_theme/templates/base.html
@@ -2,12 +2,7 @@
 
 {%- block custom_styles %}
     <link rel="stylesheet" href="{{h.url_for_static('/css/odn_theme.css')}}" />
-
-    {%- if g.site_custom_css -%}
-    <style>
-      {{ g.site_custom_css | safe }}
-    </style>
-    {%- endif %}
+    {{ super() }}
 {% endblock %}
 
 {% block links -%}
diff --git a/ckanext/odn_theme/templates/header.html b/ckanext/odn_theme/templates/header.html
index 3121daf..9e54b29 100644
--- a/ckanext/odn_theme/templates/header.html
+++ b/ckanext/odn_theme/templates/header.html
@@ -16,44 +16,6 @@ <h1 id="sitetitlestring">
   {% endif %}
 {% endblock %}
 
-{% block header_account_logged %}
-              {% if c.userobj.sysadmin %}
-                <li>
-                  <a href="{{ h.url_for(controller='admin', action='index') }}" title="{{ _('Sysadmin settings') }}">
-                    <i class="icon-legal"></i>
-                  </a>
-                </li>
-              {% endif %}
-              <li>
-                <a href="{{ h.url_for(controller='user', action='read', id=c.userobj.name) }}" class="image" title="{{ _('View profile') }}">
-                  {{ h.gravatar((c.userobj.email_hash if c and c.userobj else ''), size=22) }}
-                  <span class="username">{{ h.user_display_name() }}</span>
-                </a>
-              </li>
-              {% set new_activities = h.new_activities() %}
-              <li class="notifications {% if new_activities > 0 %}notifications-important{% endif %}">
-                {% set notifications_tooltip = ngettext('Dashboard (%(num)d new item)', 'Dashboard (%(num)d new items)', new_activities) %}
-                <a href="{{ h.url_for(controller='user', action='dashboard') }}" title="{{ notifications_tooltip }}">
-                  <i class="icon-dashboard"></i>
-                  <span>{{ new_activities }}</span>
-                </a>
-              </li>
-              {% block header_account_settings_link %}
-                <li>
-                  <a href="{{ h.url_for(controller='user', action='edit', id=c.userobj.name) }}" title="{{ _('Edit settings') }}">
-                    <i class="icon-cog"></i>
-                  </a>
-                </li>
-              {% endblock %}
-              {% block header_account_log_out_link %}
-                <li>
-                  <a href="{{ h.url_for('/user/_logout') }}" title="{{ _('Log out') }}">
-                    <i class="icon-signout"></i>
-                  </a>
-                </li>
-              {% endblock %}
-{% endblock %}
-
 {% block header_site_navigation %}
         <nav class="section navigation">
           <ul class="nav nav-pills">
diff --git a/ckanext/odn_theme_ic/__init__.py b/ckanext/odn_theme_ic/__init__.py
new file mode 100644
index 0000000..2e2033b
--- /dev/null
+++ b/ckanext/odn_theme_ic/__init__.py
@@ -0,0 +1,7 @@
+# this is a namespace package
+try:
+    import pkg_resources
+    pkg_resources.declare_namespace(__name__)
+except ImportError:
+    import pkgutil
+    __path__ = pkgutil.extend_path(__path__, __name__)
diff --git a/ckanext/odn_theme_ic/plugin.py b/ckanext/odn_theme_ic/plugin.py
new file mode 100644
index 0000000..d37570f
--- /dev/null
+++ b/ckanext/odn_theme_ic/plugin.py
@@ -0,0 +1,16 @@
+'''
+Created on 11.9.2015
+
+@author: mvi
+'''
+import ckan.plugins as plugins
+import ckan.plugins.toolkit as toolkit
+
+class OdnThemeICPlugin(plugins.SingletonPlugin):
+    '''ODN theme plugin for Internal Catalog
+    '''
+    plugins.implements(plugins.IConfigurer)
+    
+    def update_config(self, config):
+        toolkit.add_template_directory(config, 'templates') # html (jinja2)
+        toolkit.add_public_directory(config, 'public') # css and js
diff --git a/ckanext/odn_theme_ic/public/css/odn_theme_ic.css b/ckanext/odn_theme_ic/public/css/odn_theme_ic.css
new file mode 100644
index 0000000..e69de29
diff --git a/ckanext/odn_theme_ic/templates/base.html b/ckanext/odn_theme_ic/templates/base.html
new file mode 100644
index 0000000..b088106
--- /dev/null
+++ b/ckanext/odn_theme_ic/templates/base.html
@@ -0,0 +1,9 @@
+{% ckan_extends %}
+
+{%- block custom_styles %}
+    <link rel="stylesheet" href="{{h.url_for_static('/css/odn_theme_ic.css')}}" />
+    {{ super() }}
+{% endblock %}
+
+
+
diff --git a/ckanext/odn_theme_ic/templates/header.html b/ckanext/odn_theme_ic/templates/header.html
new file mode 100644
index 0000000..90d633d
--- /dev/null
+++ b/ckanext/odn_theme_ic/templates/header.html
@@ -0,0 +1,39 @@
+{% ckan_extends %}
+
+{% block header_account_logged %}
+              {% if c.userobj.sysadmin %}
+                <li>
+                  <a href="{{ h.url_for(controller='admin', action='index') }}" title="{{ _('Sysadmin settings') }}">
+                    <i class="icon-legal"></i>
+                  </a>
+                </li>
+              {% endif %}
+              <li>
+                <a href="{{ h.url_for(controller='user', action='read', id=c.userobj.name) }}" class="image" title="{{ _('View profile') }}">
+                  {{ h.gravatar((c.userobj.email_hash if c and c.userobj else ''), size=22) }}
+                  <span class="username">{{ h.user_display_name() }}</span>
+                </a>
+              </li>
+              {% set new_activities = h.new_activities() %}
+              <li class="notifications {% if new_activities > 0 %}notifications-important{% endif %}">
+                {% set notifications_tooltip = ngettext('Dashboard (%(num)d new item)', 'Dashboard (%(num)d new items)', new_activities) %}
+                <a href="{{ h.url_for(controller='user', action='dashboard') }}" title="{{ notifications_tooltip }}">
+                  <i class="icon-dashboard"></i>
+                  <span>{{ new_activities }}</span>
+                </a>
+              </li>
+              {% block header_account_settings_link %}
+                <li>
+                  <a href="{{ h.url_for(controller='user', action='edit', id=c.userobj.name) }}" title="{{ _('Edit settings') }}">
+                    <i class="icon-cog"></i>
+                  </a>
+                </li>
+              {% endblock %}
+              {% block header_account_log_out_link %}
+                <li>
+                  <a href="{{ h.url_for('/user/_logout') }}" title="{{ _('Log out') }}">
+                    <i class="icon-signout"></i>
+                  </a>
+                </li>
+              {% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ckanext/odn_theme_pc/__init__.py b/ckanext/odn_theme_pc/__init__.py
new file mode 100644
index 0000000..2e2033b
--- /dev/null
+++ b/ckanext/odn_theme_pc/__init__.py
@@ -0,0 +1,7 @@
+# this is a namespace package
+try:
+    import pkg_resources
+    pkg_resources.declare_namespace(__name__)
+except ImportError:
+    import pkgutil
+    __path__ = pkgutil.extend_path(__path__, __name__)
diff --git a/ckanext/odn_theme_pc/plugin.py b/ckanext/odn_theme_pc/plugin.py
new file mode 100644
index 0000000..fbe6045
--- /dev/null
+++ b/ckanext/odn_theme_pc/plugin.py
@@ -0,0 +1,16 @@
+'''
+Created on 11.9.2015
+
+@author: mvi
+'''
+import ckan.plugins as plugins
+import ckan.plugins.toolkit as toolkit
+
+class OdnThemePCPlugin(plugins.SingletonPlugin):
+    '''ODN theme plugin for Public Catalog
+    '''
+    plugins.implements(plugins.IConfigurer)
+    
+    def update_config(self, config):
+        toolkit.add_template_directory(config, 'templates') # html (jinja2)
+        toolkit.add_public_directory(config, 'public') # css and js
diff --git a/ckanext/odn_theme_pc/public/css/odn_theme_pc.css b/ckanext/odn_theme_pc/public/css/odn_theme_pc.css
new file mode 100644
index 0000000..e69de29
diff --git a/ckanext/odn_theme_pc/templates/base.html b/ckanext/odn_theme_pc/templates/base.html
new file mode 100644
index 0000000..53c4ee5
--- /dev/null
+++ b/ckanext/odn_theme_pc/templates/base.html
@@ -0,0 +1,9 @@
+{% ckan_extends %}
+
+{%- block custom_styles %}
+    <link rel="stylesheet" href="{{h.url_for_static('/css/odn_theme_pc.css')}}" />
+    {{ super() }}
+{% endblock %}
+
+
+
diff --git a/setup.py b/setup.py
index 0e78519..08e74e3 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,11 @@
     url='',
     license='',
     packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
-    namespace_packages=['ckanext', 'ckanext.odn_theme', 'ckanext.extras'],
+    namespace_packages=['ckanext',
+                        'ckanext.odn_theme',
+                        'ckanext.odn_theme_ic',
+                        'ckanext.odn_theme_pc',
+                        'ckanext.extras'],
     package_data={'': [
             'i18n/*/LC_MESSAGES/*.po',
             'i18n/*/base/images/*.jpg',
@@ -51,6 +55,8 @@
     entry_points='''
     [ckan.plugins]
     odn_theme=ckanext.odn_theme.plugin:OdnThemePlugin
+    odn_theme_ic=ckanext.odn_theme_ic.plugin:OdnThemeICPlugin
+    odn_theme_pc=ckanext.odn_theme_pc.plugin:OdnThemePCPlugin
     odn_package_extras=ckanext.extras.plugin:PackageExtrasPlugin
     ''',
 )