fedora-commops / fedora-happiness-packets

Clone
Source Code
GIT

#26 Add share buttons
Merged 5 years ago by jonatoni. Opened 5 years ago by algogator.
fedora-commops/ algogator/fedora-happiness-packets footer  into  master

file modified
+40 -8 
@@ -11,7 +11,7 @@ 
 

  }
 

  

  a, a:hover {
 

-     color: #F64747;
 

+     color: #294172;
 

  }
 

  

  aside {
 
@@ -78,16 +78,16 @@ 
 

  

  .btn {
 

      background: white;
 

-     border: 1px solid #F64747;
 

-     color: #F64747;
 

+     border: 1px solid #294172;
 

+     color: #294172;
 

      text-transform: uppercase;
 

      padding: 0.9em 1.3em;
 

  }
 

  

  .btn:hover {
 

-     background: #F64747;
 

+     background: #294172;
 

      color: white;
 

-     border: 1px solid #F64747;
 

+     border: 1px solid #294172;
 

  }
 

  

  .row.content {
 
@@ -115,9 +115,9 @@ 
 

          width: 25%;
 

          height: calc(100% + 20px);
 

          position: fixed;
 

-         background: -moz-linear-gradient(top,  #F23030 0%, #f64747 27%, #f64747 27%, #F23030 100%);
 

-         background: -webkit-linear-gradient(top,  #F23030 0%,#f64747 27%,#f64747 27%,#F23030 100%);
 

-         background: linear-gradient(to bottom,  #F23030 0%,#f64747 27%,#f64747 27%,#F23030 100%);
 

+         background: -moz-linear-gradient(top,  #3c6eb4 0%, #3c6eb4 27%, #3c6eb4 27%, #3c6eb4 100%);
 

+         background: -webkit-linear-gradient(top,  #3c6eb4 0%, #3c6eb4 27%, #3c6eb4 27%, #3c6eb4 100%);
 

+         background: linear-gradient(to bottom,  #3c6eb4 0%, #3c6eb4 27%, #3c6eb4 27%, #3c6eb4 100%);
 

      }
 

  

      aside .sidebar {
 
@@ -169,3 +169,35 @@ 
 

      color: white;
 

      border: none;
 

  }
 

+ 

+ .sharebutton {
 

+     position: relative;
 

+     height: 28px;
 

+     box-sizing: border-box;
 

+     background-color: #3B5998;
 

+     padding: 1px 10px 1px 9px;
 

+     color: #fff;
 

+     font-weight: 500;
 

+     cursor: pointer;
 

+     inherit: none;
 

+     display: inline-block;
 

+     vertical-align: top;
 

+     font: normal normal normal 11px/18px 'Helvetica Neue',Arial,sans-serif;
 

+     font-size: 13px;
 

+     line-height: 26px;
 

+     border-radius: 4px;
 

+ }
 

+ 

+ .sharebutton:hover {
 

+     text-decoration: none;
 

+     color: #fff;
 

+     background-color: #2f4779;
 

+ }
 

+ 

+ .google{
 

+     background-color: #d34836;
 

+ }
 

+ 

+ .google:hover{
 

+     background-color: #b72213;
 

+ }

file modified
+1 
@@ -21,6 +21,7 @@ 
 

  

  class ArchiveListView(ListView):
 

      model = Message
 

+     paginate_by = 5
 

  

      def get_queryset(self):
 

          queryset = super(ArchiveListView, self).get_queryset()

file modified
+5 -2 
@@ -12,6 +12,7 @@ 
 

      <link href="{% static 'css/datepicker.css' %}" rel="stylesheet">
 

      <link href="{% static 'css/custom.css' %}" rel="stylesheet">
 

      <link href="{% static 'images/favicon.ico' %}" rel="icon" type="image/x-icon">
 

+     <script src="https://apis.google.com/js/platform.js" async defer></script>
 

  

      <!--[if lt IE 8]>
 

          <link href="{% static 'css/bootstrap-ie7.css' %}" rel="stylesheet">
 
@@ -20,6 +21,7 @@ 
 

  </head>
 

  

  <body>
 

+     {% include "facebook.html" %}
 

      <aside>
 

          <div class="sidebar">
 

              {% url 'messaging:start' as url %}
 
@@ -69,9 +71,10 @@ 
 

              </div>
 

              <footer><small>
 

                  <hr>
 

-                 <a href="https://twitter.com/intent/tweet?button_hashtag=FedoraAppreciationWeek2k18" class="twitter-hashtag-button" data-size="large" data-dnt="true">Tweet #FedoraAppreciationWeek2k18</a>
 

-                 <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
 

+                 {% block footer %}
 

+                 {% include "follow.html" %}
 

                  <br>
 

+                 {% endblock %}
 

                  Fedora Happiness Packets is a fork of <a href="https://github.com/mxsasha/happinesspackets/">Happiness Packets</a> and part of GSoC 2018.
 

                  <br>
 

                  Need help? <a href="mailto:fedora.happinesspackets@gmail.com">fedora.happinesspackets@gmail.com</a>

file added
+17 
@@ -0,0 +1,17 @@ 
 

+ <script>
 

+     window.fbAsyncInit = function() {
 

+       FB.init({
 

+         appId            : '240221016763634',
 

+         autoLogAppEvents : true,
 

+         xfbml            : true,
 

+         version          : 'v3.0'
 

+       });
 

+     };
 

+     (function(d, s, id){
 

+        var js, fjs = d.getElementsByTagName(s)[0];
 

+        if (d.getElementById(id)) {return;}
 

+        js = d.createElement(s); js.id = id;
 

+        js.src = "https://connect.facebook.net/en_US/sdk.js";
 

+        fjs.parentNode.insertBefore(js, fjs);
 

+      }(document, 'script', 'facebook-jssdk'));
 

+   </script>

file added
+6 
@@ -0,0 +1,6 @@ 
 

+ <a class="g-interactivepost sharebutton google" data-contenturl="https://happinesspackets.fedorainfracloud.org/" data-clientid="427442962349-biuc5ks65luss5h3v5oqtj15jigaqoib.apps.googleusercontent.com" data-cookiepolicy="single_host_origin" data-prefilltext="#FedoraAppreciationWeek2k18" data-calltoactionurl="http://plus.google.com/pages/create"><i class="fab fa-google-plus-g fa-lg"></i> Share #FedoraAppreciationWeek2k18</a>
 

+ <script type="text/javascript">(function() {var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true; po.src = 'https://apis.google.com/js/client:plusone.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);})();</script>
 

+ <a id="fb" class="sharebutton"><i class="fab fa-facebook fa-lg"></i> Share #FedoraAppreciationWeek2k18</a>
 

+ <script>document.getElementById('fb').onclick = function() {FB.ui({method: 'share', mobile_iframe: true, hashtag: '#FedoraAppreciationWeek2k18', href: 'https://happinesspackets.fedorainfracloud.org/',}, function(response){});}</script>
 

+ <a href="https://twitter.com/intent/tweet?button_hashtag=FedoraAppreciationWeek2k18" class="twitter-hashtag-button" data-size="large" data-dnt="true">Tweet #FedoraAppreciationWeek2k18</a>
 

+ <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>

file modified
+26 -5 
@@ -1,12 +1,33 @@ 
 

  {% for message in message_list %}
 

-     <h4>
 

+ <h4>
 

          {% if message.sender_approved_public_named and message.recipient_approved_public_named %}
 

              From {{ message.sender_name }} to {{ message.recipient_name }}
 

          {% else %}
 

              Anonymous message
 

          {% endif %}
 

      </h4>
 

-     <blockquote>
 

-         {{ message.message|linebreaksbr }}
 

-     </blockquote>
 

- {% endfor %}
 

+ <blockquote>
 

+   {{ message.message|linebreaksbr }}
 

+ </blockquote>
 

+ {% endfor %} {% block pagination %} {% if is_paginated %}
 

+ <div class="pagination">
 

+   {% if page_obj.has_previous %}
 

+   <li class="page-item">
 

+     <a href="{{ request.path }}?page={{ page_obj.previous_page_number }}">
 

+             <span aria-hidden="true">&laquo;</span>
 

+             <span class="sr-only">Previous</span>
 

+           </a>
 

+   </li>
 

+   {% endif %} {% for i in paginator.page_range %}
 

+   <li class="page-item"><a class="page-link" href="?page={{ i }}">{{ i }}</a></li>
 

+   {% endfor %} {% if page_obj.has_next %}
 

+   <li class="page-item">
 

+     <a href="{{ request.path }}?page={{ page_obj.next_page_number }}">
 

+               <span aria-hidden="true">&raquo;</span>
 

+               <span class="sr-only">Next</span>
 

+             </a>
 

+   </li>
 

+   {% endif %}
 

+ </div>
 

+ 

+ {% endif %} {% endblock %}

file modified
+7 
@@ -9,5 +9,12 @@ 
 

      <p>
 

          We sent you a confirmation link to your email address. Follow the link to finalize sending your message.
 

      </p>
 

+     <a class="g-interactivepost sharebutton google" data-contenturl="https://happinesspackets.fedorainfracloud.org/" data-clientid="427442962349-biuc5ks65luss5h3v5oqtj15jigaqoib.apps.googleusercontent.com" data-cookiepolicy="single_host_origin" data-prefilltext="I just sent a happiness packet to thank a @fedora community member #FedoraAppreciationWeek2k18" data-calltoactionurl="http://plus.google.com/pages/create"><i class="fab fa-google-plus-g fa-lg"></i> Share #FedoraAppreciationWeek2k18</a>
 

+     <script type="text/javascript">(function() {var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true; po.src = 'https://apis.google.com/js/client:plusone.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);})();</script>
 

+     <a id="fb" class="sharebutton"><i class="fab fa-facebook fa-lg"></i> Share #FedoraAppreciationWeek2k18</a>
 

+     <script>document.getElementById('fb').onclick = function() {FB.ui({method: 'share', mobile_iframe: true, hashtag: '#FedoraAppreciationWeek2k18', href: 'https://happinesspackets.fedorainfracloud.org/',}, function(response){});}</script>
 

+     <a href="https://twitter.com/intent/tweet?button_hashtag=FedoraAppreciationWeek2k18&text=I%20just%20sent%20a%20happiness%20packet%20to%20thank%20a%20@fedora%20community%20member" class="twitter-hashtag-button" data-size="large" data-dnt="true">Tweet #FedoraAppreciationWeek2k18</a>
 

+     <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
 

+     {% block footer %}{% endblock %}
 

  

  {% endblock content %}

no initial comment

1 new commit added

  • Add pagination
5 years ago

we need to change the hashtag, as Justin said at #32 - but you can open another PR once we decide it

Pull-Request has been merged by jonatoni
5 years ago
Metadata
None
No Tags
Changes Summary 7
+40 -8
file changed
assets/css/custom.css
+1 -0
file changed
happinesspackets/messaging/views.py
+5 -2
file changed
templates/base.html
+17
file added
templates/facebook.html
+6
file added
templates/follow.html
+26 -5
file changed
templates/messaging/_message_list.html
+7 -0
file changed
templates/messaging/message_sender_confirmation_sent.html
Powered by Pagure 5.13.3
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.