Merge lp:~daker/summit/fix.1147863 into lp:summit

[Adnane Belmadiaf]

This is a Work in progress (DO NOT MERGE)

[lp:~daker/summit/fix.1147863]

507. By Adnane Belmadiaf on 2013-03-30

Revet code

Unmerged revisions

507. By Adnane Belmadiaf on 2013-03-30

Revet code

506. By Adnane Belmadiaf on 2013-03-10

Stop requiring someone to be 'attending' in LP

=== modified file 'Makefile'
--- Makefile	2012-10-02 17:36:35 +0000
+++ Makefile	2013-03-30 21:30:31 +0000
@@ -29,7 +29,7 @@
 	$(django_manage) update
 
 run: env apps db
-	$(django_manage) runserver
+	$(django_manage) runserver --settings=ubuntu_settings
 
 test: env apps
 	$(django_manage) test schedule sponsor

=== modified file 'summit/common/templates/common/index.html'
--- summit/common/templates/common/index.html	2012-04-23 14:07:02 +0000
+++ summit/common/templates/common/index.html	2013-03-30 21:30:31 +0000
@@ -1,23 +1,22 @@
 {% extends "base.html" %}
-{% load datetime %}
+{% load datetime markup %}
 
 {% block page_name %}Home{%endblock %}
-{% block extrahead %}
-{{ block.super }}
+{% block extrahead %}{{ block.super }}
+<link rel="stylesheet" type="text/css" media="all" href="https://fonts.googleapis.com/css?family=Ubuntu:300,300italic,400,400italic,500" />
 {% endblock %}
 
 {% block sub_nav %}{% endblock %}
 
 {% block content %}
-<div class="row">
-<article class="span-12">
-    {% if summit %}
-    <h1><a href="/{{ summit.name }}">{{ summit.title }} &rsaquo;</a></h1>
-      {% include "schedule/summit_info.html" %}
-    {% else %}
-    <p>No summits registered.</p>
-    {% endif %}
-</article>
+<div class="row row-hero">
+    <div class="span-12">
+        {% if summit %}
+            {% include "schedule/summit_info.html" %}
+        {% else %}
+            <p>No summits registered.</p>
+        {% endif %}
+    </div>
 </div>
 {% endblock %}
 {% block closure %}

=== modified file 'summit/media/css/style.css'
--- summit/media/css/style.css	2012-01-22 18:36:40 +0000
+++ summit/media/css/style.css	2013-03-30 21:30:31 +0000
@@ -66,3 +66,51 @@
 .summit-columns ul li h3 a:hover { text-decoration: underline; }
 .summit-columns ul li img { padding: 10px 0 5px; }
 .summit-columns p { margin-bottom: 5px; }
+
+
+/* Homepage */
+
+.fb_ltr {
+    position: relative;
+    top: -2px;
+}
+
+.inner-wrapper div.row:first-child {
+    margin-top: 35px;
+}
+
+.row-hero {
+    margin-bottom: 30px;
+    padding-bottom: 20px;
+    background: url('https://uds.ubuntu.com/wp-content/themes/ubuntu-developer-summit/assets/img/v2/home-hero.png') 580px 8px no-repeat;
+}
+
+.row-hero h1 {
+    margin: 0 0 20px 10px;
+    font-size: 2.3em;
+    font-weight: 300;
+    line-height: 1.3;
+    max-width: 580px;
+}
+
+.row-hero h2 {
+margin: 0 0 20px 10px;
+font-size: 2.1em;
+font-weight: 250;
+line-height: 1.3;
+max-width: 580px;
+}
+
+.row-hero .link-cta {
+    margin-left: 10px;
+    font-size: 16px;
+    margin-top: 10px;
+    padding: 10px;
+    background: url('../../ubuntu-website/media/images/background-cta.png') center 0 repeat-x #dd4814;
+    display: block;
+    float: left;
+    color: #fff !important;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    border-radius: 4px;
+}
\ No newline at end of file

=== modified file 'summit/schedule/templates/schedule/summit.html'
--- summit/schedule/templates/schedule/summit.html	2013-03-20 02:00:45 +0000
+++ summit/schedule/templates/schedule/summit.html	2013-03-30 21:30:31 +0000
@@ -24,64 +24,24 @@
 {% endblock %}
 
 {% block content %}
-
-<div class="row">
-    <section class="span-8">
-        <h1>{{ summit.title }}</h1>
+<div class="row row-hero">
+    <div class="span-12">
+        {% if summit %}
             {% include "schedule/summit_info.html" %}
-    </section>
-    <article class="span-4 last">
-        {% include "schedule/actions.html" %}
-    </article>
-</div>
-
-<div class="row">
-    <section class="span-8">
-        {% if attendee %}
-            <p>You are attending, you can update the days and times of your attendance <ins></ins>
-                <a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}/+attend"><img src="/media/img/gem-sm.png" /> Launchpad</a>.
-            </p>
-            <p>Download your 
-                <a href="/{{ summit.name }}/participant/my_schedule_{{ attendee.secret_key }}.ical">Participation Schedule</a> to import into your Calendar.
-            </p>
         {% else %}
-            {% if request.user.is_authenticated %}
-                <p><strong>You are not registered as attending.</strong></p>
-                <p>You can register your attendance in
-                    <a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}/+attend"><img src="/media/img/gem-sm.png" /> Launchpad</a>.
-                    If you have recently done so, wait a few minutes and reload this page.
-                </p>
-            {% else %}
-                <p><strong>You are not logged in.</strong></p>
-                <p><a href="/openid/login?next={{login_next}}">Log in now</a></p>
-            {% endif %}
+            <p>No summits registered.</p>
         {% endif %}
-    </section>
-    <article class="span-4 last">
-        <div class="share alone">
-            <a href="http://www.reddit.com/submit" onclick="window.location = 'http://www.reddit.com/submit?url=' + encodeURIComponent(window.location); return false"> <img style="padding-bottom: 4px; border: 0;" src="http://www.reddit.com/static/spreddit7.gif" alt="submit to reddit" /></a><br />
-            <div id="fb-root"></div>
-            <script>(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 = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=310260202349342";
-                fjs.parentNode.insertBefore(js, fjs);
-            }(document, 'script', 'facebook-jssdk'));</script>
-            <div class="fb-like" data-href="" data-send="false" data-layout="box_count" data-width="40" data-show-faces="false" data-font="arial"></div>
-            <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
-            <g:plusone size="tall"></g:plusone>
-            <a href="http://twitter.com/share" class="twitter-share-button" data-count="vertical" data-lang="en">Tweet</a>
-            <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
-            <script src="http://www.stumbleupon.com/hostedbadge.php?s=5"></script>
-        </div>
-    </article>
+    </div>
 </div>
+
 <div class="row">
     <article class="span-8">
             {% include "schedule/schedule_list.html" %}
     </article>
+
+
     <article class="span-4 last">
+<<<<<<< TREE
         {% if summit.hashtag %}
         <div class="share alone">
             <h3>Latest from Twitter</h3>
@@ -96,6 +56,10 @@
         <script type="text/javascript" src="http://api.twitter.com/1/statuses/user_timeline.json?screen_name={{ summit.hashtag }}&callback=twitterCallback2&amp;count=5"></script>  
         {% endif %}
     </article>    
+=======
+        {% include "schedule/actions.html" %}
+    </article>
+>>>>>>> MERGE-SOURCE
 </div>
 {% endblock %}
 {% block closure %}

=== modified file 'summit/schedule/templates/schedule/summit_info.html'
--- summit/schedule/templates/schedule/summit_info.html	2012-07-12 13:30:22 +0000
+++ summit/schedule/templates/schedule/summit_info.html	2013-03-30 21:30:31 +0000
@@ -1,9 +1,33 @@
 {% load datetime markup %}
 
-<p class="location">{{ summit.location }}</p>
-{% if summit.start and summit.end %}
-<p class="date"><strong>Starts:</strong> {{ summit.start|strftime:"%a, %d %b %Y %H:%M:%S %Z" }}<br/>
-<strong>Ends:</strong> {{ summit.end|strftime:"%a, %d %b %Y %H:%M:%S %Z" }}</p>
-{% endif %}
-<p class="description">{{ summit.description|markdown:'safe' }}</p>
-<p><a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}"><img src="/media/img/gem-sm.png" alt="Launchpad" />Launchpad Information &rsaquo;</a></p>
+{% if summit.location %}
+    <h1>{{ summit.title }}</h1>
+    <h2>{{ summit.location }}</h2>
+{% else %}
+    <h1>Online on {{ summit.start|strftime:"%a, %d %b %Y %H:%M:%S %Z" }}-{{ summit.end|strftime:"%a, %d %b %Y %H:%M:%S %Z" }} <br> from 2pm-8pm UTC</h1>
+{% endif %}
+<div class="share" style="margin-left: 10px;">
+    <div id="fb-root"></div>
+    <script>(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 = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=310260202349342";
+        fjs.parentNode.insertBefore(js, fjs);
+    }(document, 'script', 'facebook-jssdk'));</script>
+    <div class="fb-like" data-href="" data-send="false" data-layout="button_count" data-width="40" data-show-faces="false" data-font="arial"></div>
+    <a href="https://twitter.com/share" class="twitter-share-button" data-related="Ubuntu" data-count="none" data-hashtags="uds" data-dnt="true">Tweet</a>
+    <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+    <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
+    <g:plusone size="medium"></g:plusone>
+</div>
+{% if attendee %}
+    <a class="link-cta" href="/{{ summit.name }}/participant/my_schedule_{{ attendee.secret_key }}.ical">Get your schedule</a>
+{% else %}
+    <a class="link-cta" href="/{{ summit.name }}/register/">Register to attend</a>
+    <span style="position: relative; top: 18px;left: 5px;"> or <a href="/{{ summit.name }}/">Check the schedule</a></span>
+{% endif %}
+
+{% if summit.description %}
+    <p class="description">{{ summit.description|markdown:'safe' }}</p>
+{% endif %}
\ No newline at end of file

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2013-03-15 01:06:10 +0000
+++ summit/schedule/views.py	2013-03-30 21:30:31 +0000
@@ -1173,3 +1173,19 @@
         context,
         RequestContext(request)
     )
+
+
+@summit_required
+def register_attendee(request, summit, attendee,):
+    if attendee is None:
+        summit.attendee_set.create(
+            user=request.user,
+            start=summit.start,
+            end=summit.end
+        )
+    return HttpResponseRedirect(
+        reverse(
+            'summit.schedule.views.summit',
+            args=(summit.name,)
+        )
+    )

=== modified file 'summit/urls.py'
--- summit/urls.py	2013-02-26 19:31:21 +0000
+++ summit/urls.py	2013-03-30 21:30:31 +0000
@@ -66,6 +66,7 @@
     url(r'^past/', 'past', name='past'),
     url(r'^logout$', 'logout_view', name='logout'),
     (r'^(?P<summit_name>[\w-]+)/$', 'summit'),
+    (r'^(?P<summit_name>[\w-]+)/register/$', 'register_attendee'),
     (r'^(?P<summit_name>[\w-]+)/mobile/$', 'mobile'),
     (r'^(?P<summit_name>[\w-]+)/search/$', 'search'),
     (r'^(?P<summit_name>[\w-]+)/propose_meeting/$', 'propose_meeting'),