Fixed merge conflicts

AUTHORS.rst

@@ -0,0 +1,13 @@
+Authors
+=======
+
+Praekelt.Org
+------------
+* Saeed Marzban
+* Mitso Qalaba
+
+Praekelt Consulting
+-------------------
+* Cilliers Blignaut
+
+

CHANGES.rst

@@ -4,3 +4,8 @@ CHANGE LOG
 0.0.1
 -----
 - initial release
+
+1.0.0
+-----
+- Updated README.md
+- Disable Recent and Popular Tip Views if no tips have been published.

README.rst

@@ -0,0 +1,81 @@
+molo.yourtips
+#############
+.. image:: https://travis-ci.org/praekeltfoundation/molo.yourtips.svg
+    :target: https://travis-ci.org/praekeltfoundation/molo.yourtips
+.. image:: https://img.shields.io/pypi/v/molo.yourtips.svg
+    :target: https://pypi.python.org/pypi/molo.yourtips
+
+**This feature enables youth to share short tips with one another.**
+
+.. contents:: Table of Contents
+   :depth: 1
+
+Requirements
+============
+
+#. django >= 1.8
+
+#. molo.core >= 5.5.0
+
+#. django-secretballot >= 0.7.0
+
+#. django-likes >= 1.11
+
+Prerequisite
+============
+#. Install or add ``django-likes`` to your Python path.
+
+#. Configure ``django-secretballot`` as described `here <http://pypi.python.org/pypi/django-secretballot/>`_.
+
+#. Add ``likes`` to your ``INSTALLED_APPS`` setting.
+
+#. Add likes url include to your project's ``urls.py`` file::
+
+    url(r'^likes/',
+        include('likes.urls',
+                namespace='likes',
+                app_name='likes')),
+
+#. Add ``likes.middleware.SecretBallotUserIpUseragentMiddleware`` to your ``MIDDLEWARE_CLASSES`` setting, i.e.::
+
+    MIDDLEWARE_CLASSES = (
+        ...other middleware classes...
+        "likes.middleware.SecretBallotUserIpUseragentMiddleware",
+    )
+
+#. Add ``django.core.context_processors.request`` to your ``TEMPLATE_CONTEXT_PROCESSORS`` setting, i.e.::
+
+    TEMPLATE_CONTEXT_PROCESSORS = (
+        ...other context processors...
+        "django.core.context_processors.request",
+    )
+
+Installation
+============
+
+#. pip install molo.yourtips
+
+#. Add ``molo.yourtips`` to your ``INSTALLED_APPS`` settings.
+
+#. Add yourtips url include to your project's ``urls.py`` file::
+
+    url(r'^yourtips/', include('molo.yourtips.urls',
+                               namespace='molo.yourtips')),
+
+#. Create and publish a YourTips page on the CMS. By adding the YourTips page the
+
+Feature List
+============
+
+#. This feature enables youth to share short (twitter length - 140 characters) tips on the platform with one another.
+#. User submitted tips are curated by content managers and published on the platform.
+#. Users can interact with published tips by liking each others tips or sharing (requires consent from author) on facebook or twitter.
+
+YourTips Settings
+=================
+
+#. Homepage Banner Copy
+-----------------------
+#. By default the homepage banner copy is ``Do you have advice you can share with other youth on relationships?``.
+#. The homepage banner copy by adding the copy the yourtips settings.
+

VERSION

@@ -1 +1 @@
-0.0.1
+1.0.0

molo/yourtips/models.py

@@ -75,6 +75,7 @@ class YourTip(TranslatablePageMixinNotRoutable, Page):
 
     homepage_action_copy = models.CharField(
         null=True, blank=True,
+        verbose_name="Homepage Banner Copy",
         max_length=255)
 
     def get_effective_extra_style_hints(self):

molo/yourtips/templates/yourtips/your_tip.html

@@ -13,23 +13,28 @@
       </li>
     </ul>
   </div>
-  <ul class="yourtips-menu">
-    <li class="yourtips-menu__item">
-      <a href="{% url 'molo.yourtips:recent_tips' %}" class="call-to-action__nav-item">
-        {% trans "Recent Tips" %}
-      </a>
-    </li>
-    <li class="yourtips-menu__item">
-      <a href="{% url 'molo.yourtips:popular_tips' %}" class="call-to-action__nav-item">
-        {% trans "Popular Tips" %}
-      </a>
-    </li>
-    <li class="yourtips-menu__item">
-      <a href="{% url 'molo.yourtips:tip_entry' 'your-tips-page' %}" class="call-to-action__nav-item">
-        {% trans "Submit a Tip!" %}
-
-      </a>
-    </li>
-  </ul>
+  <div class="yourtips">
+    <ul class="yourtips-menu">
+      {% if your_tip.get_number_of_tips %}
+      <li class="yourtips-menu__item">
+        <a href="{% url 'molo.yourtips:recent_tips' %}" class="call-to-action__nav-item">
+          {% trans "Recent Tips" %}
+        </a>
+      </li>
+      {% endif %}
+      {% if your_tip.get_number_of_popular_tips %}
+      <li class="yourtips-menu__item">
+        <a href="{% url 'molo.yourtips:popular_tips' %}" class="call-to-action__nav-item">
+          {% trans "Popular Tips" %}
+        </a>
+      </li>
+      {% endif %}
+      <li class="yourtips-menu__item">
+        <a href="{% url 'molo.yourtips:tip_entry' 'your-tips-page' %}" class="call-to-action__nav-item">
+          {% trans "Submit a Tip!" %}
+        </a>
+      </li>
+    </ul>
   </div>
+</div>
 {% endblock %}

molo/yourtips/templates/yourtips/your_tips_on_homepage.html

@@ -1,6 +1,7 @@
-{% load wagtailcore_tags wagtailimages_tags static core_tags i18n %}
+{% load wagtailcore_tags wagtailimages_tags static core_tags tip_tags i18n %}
 {% block content %}
-{% if article_tip %}
+{% get_your_tip as your_tip %}
+{% if article_tip and your_tip.get_number_of_tips %}
 <div class="yourtips">
   <h1 class="heading heading--yourtips">
     {% trans "Tip of the Day" %}

molo/yourtips/templates/yourtips/your_tips_on_tip_submission_form.html

@@ -1,7 +1,8 @@
-{% load wagtailcore_tags wagtailimages_tags static core_tags i18n %}
+{% load wagtailcore_tags wagtailimages_tags static tip_tags core_tags i18n %}
 {% block content %}
+{% get_your_tip as your_tip %}
 <div class="yourtips">
-{% if most_popular_tip %}
+{% if most_popular_tip and your_tip.get_number_of_popular_tips %}
 <!--This should only be active when it has a like and more -->
   <h2 class="heading heading--yourtips-title heading--line-break">
     {% trans "Most popular tip" %}</h2>
@@ -18,7 +19,7 @@ <h3 class="yourtips__description">{{ block.value }}</h3>
   </div>
 {% endif %}
 
-{% if most_recent_tip %}
+{% if most_recent_tip and your_tip.get_number_of_tips %}
   <h2 class="heading heading--yourtips-title">{% trans "Most recent tip" %}</h2>
   <div class="yourtips-list">
     <div class="yourtips-list__item">

molo/yourtips/tests/test_views.py

@@ -51,25 +51,3 @@ def test_yourtips_recent_tip_view(self):
         response = self.client.get(reverse('molo.yourtips:recent_tips'))
         self.assertContains(response, 'Test')
         self.assertContains(response, 'test body')
-
-    def test_yourtips_popular_tip_view(self):
-        self.client.login(
-            username=self.superuser_name,
-            password=self.superuser_password
-        )
-
-        entry = YourTipsEntry.objects.create(
-            optional_name='Test',
-            tip_text='test body',
-            allow_share_on_social_media=True,
-        )
-
-        self.client.get(
-            '/django-admin/yourtips/yourtipsentry/%d/convert/' % entry.id
-        )
-        article = YourTipsArticlePage.objects.get(title='Tip-%s' % entry.id)
-        article.save_revision().publish()
-
-        response = self.client.get(reverse('molo.yourtips:popular_tips'))
-        self.assertContains(response, 'Test')
-        self.assertContains(response, 'test body')

molo/yourtips/views.py

@@ -75,7 +75,8 @@ def get_queryset(self, *args, **kwargs):
         main = self.request.site.root_page
         context = {'request': self.request}
         locale = self.request.LANGUAGE_CODE
-        articles = YourTipsArticlePage.objects.all(
+        articles = YourTipsArticlePage.objects.filter(
+            votes__gte=1
         ).descendant_of(main).order_by('-total_upvotes')
         return get_pages(context, articles, locale)
 

setup.py

@@ -2,9 +2,9 @@
 
 from setuptools import setup, find_packages
 
+description_files = ["README.rst", "AUTHORS.rst", "CHANGES.rst"]
+
 here = os.path.abspath(os.path.dirname(__file__))
-with open(os.path.join(here, 'README.md')) as f:
-    readme = f.read()
 
 with open(os.path.join(here, 'requirements.txt')) as f:
     requires = filter(None, f.readlines())
@@ -19,7 +19,7 @@
       version=version,
       description=('This feature enables youth to share short tips with one '
                    'another'),
-      long_description=readme,
+      long_description="".join([open(f, "r").read() for f in description_files]),
       classifiers=[
           "Programming Language :: Python",
           "Framework :: Django",