Merge branch 'release/0.1.1'

README.md

@@ -54,7 +54,7 @@ CMS Shiny is A Django app for adding [R Shiny apps](http://shiny.rstudio.com) to
     ```python
     urlpatterns = patterns('',
         ...
-        url(r'^shiny_apps/', include('cms_shiny.urls', namespace='shiny_apps')),
+        url(r'^shiny_apps/', include('cms_shiny.urls', namespace='cms_shiny')),
         ...
     )
     ```
@@ -65,6 +65,6 @@ CMS Shiny is A Django app for adding [R Shiny apps](http://shiny.rstudio.com) to
 
 - Start the development server (`python manage.py runserver`) and visit http://127.0.0.1:8000/
 
-- Create a CMS page and attach the `Shiny App` under `Advanced Settings` for the page.
+- Create a CMS page and attach the `Shiny Apps App` under `Advanced Settings` for the page.
 
-*Version 0.1.0*
+*Version 0.1.1*

cms_shiny/cms_plugins.py

@@ -9,6 +9,7 @@
 
 class ShinyAppPlugin(CMSPluginBase):
     model = ShinyAppPluginModel
+    module = "Lab Plugins"
     name = _("Shiny App Plugin")
     render_template = "cms_shiny/plugin.html"
 

cms_shiny/menu.py

@@ -20,7 +20,7 @@ def get_nodes(self, request):
         for shiny_app in ShinyApp.objects.all():
             node = NavigationNode(
                 shiny_app.name,
-                reverse('shiny_apps:shiny_app_detail', args=(shiny_app.slug,)),
+                reverse('cms_shiny:shiny_detail', args=(shiny_app.slug,)),
                 shiny_app.slug
             )
             nodes.append(node)

cms_shiny/static/cms_shiny/app.css

@@ -12,6 +12,9 @@
 /* Shiny App List View */
 /***********************/
 
+.gallery-heading {
+  margin-bottom: 25px;
+}
 .thumbnail {
   display: -webkit-box;
   display: -webkit-flex;

cms_shiny/templates/cms_shiny/_shiny_list_item.html

@@ -4,7 +4,7 @@
   <link rel="stylesheet" type="text/css" href="{% static 'cms_shiny/app.css' %}">
 {% endaddtoblock %}
 
-<a class="thumbnail" href="{% url 'shiny_apps:shiny_detail' shiny_app.slug %}">
+<a class="thumbnail" href="{% url 'cms_shiny:shiny_detail' shiny_app.slug %}">
 
   {% if shiny_app.image %}
     <img src="{{ shiny_app.image.url }}" alt="{{ shiny_app.name }}">

cms_shiny/templates/cms_shiny/shiny_detail.html

@@ -1,6 +1,10 @@
 {% extends "base.html" %}
 {% load sekizai_tags staticfiles %}
 
+{% block title %}
+  {{ shiny_app.name }}{% if LAB_NAME %} | {{ LAB_NAME }}{% endif %}
+{% endblock title %}
+
 {% block content %}
 
   {% addtoblock "css" strip %}

cms_shiny/templates/cms_shiny/shiny_list.html

@@ -4,7 +4,7 @@
 {% block content %}
 
   <div class="container">
-    <h1 class="text-center">Shiny Apps</h1>
+    <h1 class="text-center gallery-heading">Shiny Apps</h1>
     <div class="container-fluid">
       <div id="shiny-apps" class="row">
         {% for shiny_app in published_shiny_apps %}

cms_shiny/views.py

@@ -14,13 +14,14 @@ def get_queryset(self):
 
     def render_to_response(self, context, **response_kwargs):
         # Shim to affect the CMS Toolbar only
+        if self.request.toolbar:
 
-        menu = self.request.toolbar.get_or_create_menu('shiny-apps-list-menu', 'Shiny Apps')
+            menu = self.request.toolbar.get_or_create_menu('shiny-apps-list-menu', 'Shiny Apps')
 
-        url_change = reverse('admin:cms_shiny_shinyapp_changelist')
-        url_addnew = reverse('admin:cms_shiny_shinyapp_add')
-        menu.add_sideframe_item('Edit Shiny Apps', url=url_change)
-        menu.add_modal_item('Add New Shiny App', url=url_addnew)
+            url_change = reverse('admin:cms_shiny_shinyapp_changelist')
+            url_addnew = reverse('admin:cms_shiny_shinyapp_add')
+            menu.add_sideframe_item('Edit Shiny Apps', url=url_change)
+            menu.add_modal_item('Add New Shiny App', url=url_addnew)
 
         return super(ShinyAppListView, self).render_to_response(context, **response_kwargs)
 
@@ -32,11 +33,13 @@ class ShinyAppDetailView(DetailView):
 
     def render_to_response(self, context, **response_kwargs):
         # Shim to affect the CMS Toolbar only
+        if self.request.toolbar:
 
-        menu = self.request.toolbar.get_or_create_menu('shiny-apps-detail-menu', self.object.name)
+            menu = self.request.toolbar.get_or_create_menu('shiny-apps-detail-menu', self.object.name)
+
+            url_change = reverse('admin:cms_shiny_shinyapp_change', args=[self.object.id])
+            url_delete = reverse('admin:cms_shiny_shinyapp_delete', args=[self.object.id])
+            menu.add_modal_item('Edit %s' % self.object.name, url=url_change)
+            menu.add_modal_item('Delete %s' % self.object.name, url=url_delete)
 
-        url_change = reverse('admin:cms_shiny_shinyapp_change', args=[self.object.id])
-        url_delete = reverse('admin:cms_shiny_shinyapp_delete', args=[self.object.id])
-        menu.add_modal_item('Edit %s' % self.object.name, url=url_change)
-        menu.add_modal_item('Delete %s' % self.object.name, url=url_delete)
         return super(ShinyAppDetailView, self).render_to_response(context, **response_kwargs)

setup.py

@@ -43,7 +43,7 @@
 
 setup(
     name='djangocms-shiny-app',
-    version='0.1.0',
+    version='0.1.1',
     packages=['cms_shiny'],
     include_package_data=True,
     license='BSD License',