Merge pull request mixitconf#220 from mpetitdant/fix/177-speakers-on-…

…home fix mixitconf#177
mpetitdant · Mar 14, 2014 · 8678200 · 8678200
2 parents 7912039 + 00dafe1
commit 8678200
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 13 deletions.
diff --git a/app/controllers/Application.java b/app/controllers/Application.java
@@ -33,13 +33,23 @@ public static void index() {
         }
 
         // Three recent articles
-        List<Article> articles = Article.recents(1, 3);
-        List<Talk> sessions = Talk.recents(ConferenceEvent.CURRENT, 1, 3);
-        List<Member> members = Member.recents(1, 14);
         // Unused
+//        List<Article> articles = Article.recents(1, 3);
+//        List<Talk> sessions = Talk.recents(ConferenceEvent.CURRENT, 1, 3);
+//        List<Member> members = Member.recents(1, 14);
+
         // List<Map> tags = Interest.getCloud();
+
+        List<Member> currentGuestSpeakers = Talk.guestSpeakers(ConferenceEvent.CURRENT);
+
+        List<Member> guestSpeakersToDisplay = null;
+        if (currentGuestSpeakers.size() > 5 ) {
+            Collections.shuffle(currentGuestSpeakers);
+            guestSpeakersToDisplay = currentGuestSpeakers.subList(0, 6);
+        }
+
         boolean isHomePage = true;
-        render(articles, sessions, members, isHomePage);
+        render(/*articles, sessions, members, */isHomePage, guestSpeakersToDisplay);
     }
 
     public static void members() {

diff --git a/app/models/Session.java b/app/models/Session.java
@@ -263,4 +263,15 @@ public ConferenceEvent apply(@Nullable Session session) {
     public static Function<Session,ConferenceEvent> toEvent() {
         return SESSION_TO_EVENT;
     }
+
+    public static List<Member> guestSpeakers(ConferenceEvent event) {
+        return find("select distinct speaker " +
+                "from Session s " +
+                "inner join s.speakers speaker " +
+                "inner join s.comments c " +
+                "where lower(c.content) like '%guest speaker%' " +
+                "and s.event = ? " +
+                "and s.valid = true", event).fetch();
+    }
+
 }
diff --git a/app/views/Application/index.html b/app/views/Application/index.html
@@ -184,11 +184,23 @@ <h1>&{'home.headers.innovation'}</h1>
     </div>
     <!-- /.row -->
 
+    #{if guestSpeakersToDisplay?.size() > 5 }
+        <div class="row">
+            <div class="row speakers">
+                <div class="container">
+                    <h4 id="this-year" class="centeredWithLine"><span>&{'home.speakers.this-year'}</span></h4>
+                    #{list items:guestSpeakersToDisplay, as:'speaker'}
+                        #{speaker-on-home name:speaker.toString(), email:speaker.email, login:speaker.login/}
+                    #{/list}
+                </div>
+            </div>
+        </div>
+    #{/if}
+
     <div class="row">
         <div class="row speakers">
             <div class="container">
-                <h4 id="previously"><span>&{'home.speakers.previously'}</span></h4>
-
+                <h4 id="previously" class="centeredWithLine"><span>&{'home.speakers.previously'}</span></h4>
                 #{speaker-on-home name:'Zach Holman', email:'[email protected]', login:'holman'/}
                 #{speaker-on-home name:'Pamela Fox', email:'[email protected]', login:'pamelafox'/}
                 #{speaker-on-home name:'Simon Brown', email:'[email protected]', login:'simonbrown'/}
@@ -197,6 +209,8 @@ <h4 id="previously"><span>&{'home.speakers.previously'}</span></h4>
                 #{speaker-on-home name:'JC Grosjean', email:'[email protected]', login:'jcQualitystreet'/}
             </div>
         </div>
+    </div>
+
 
     <!-- START THE FEATURETTES -->
 

diff --git a/app/views/tags/speaker-on-home.html b/app/views/tags/speaker-on-home.html
@@ -4,8 +4,8 @@
     - login (for profile link)
 }*
 <div class="col-lg-2 headers">
-    <h3>${_name}</h3>
     #{a @Profile.show(_login)}
         <img class="img-thumbnail" src="#{gravatar.url _email, size:120, default:'mm', rating:'pg', secure:false/}" />
     #{/a}
+    <h3>${_name}</h3>
 </div>
diff --git a/conf/messages b/conf/messages
@@ -61,6 +61,7 @@ home.headers.development.short=Dev
 home.headers.agility=Agilité
 home.headers.innovation=Innovation
 home.speakers.previously=Précédemment, à Mix-IT
+home.speakers.this-year=Cette année, à Mix-IT
 
 home.featurette1.title=Développement, Agilité, Innovation, DevOps, Lean Startup.
 home.featurette1.subtitle=Des idées pour tout de suite&nbsp;!

diff --git a/conf/messages.en b/conf/messages.en
@@ -62,6 +62,7 @@ home.headers.development.short=Development
 home.headers.agility=Agility
 home.headers.innovation=Innovation
 home.speakers.previously=Previously, at Mix-IT
+home.speakers.this-year=This year, at Mix-IT
 
 home.featurette1.title=Development, Agility, Innovation, DevOps, Lean Startup.
 home.featurette1.subtitle=Ideas for now!

diff --git a/public/stylesheets/linkit.less b/public/stylesheets/linkit.less
@@ -15,18 +15,18 @@
   color: green;
 }
 
-#previously {
+.centeredWithLine {
   width: 100%;
   text-align: center;
   border-bottom: 1px solid #eee;
   line-height: 0.1em;
   margin-bottom: 25px;
-}
 
-#previously span {
-  background: white;
-  padding: 0 10px;
-  color: #5A5A5A;
+  span {
+    background: white;
+    padding: 0 10px;
+    color: #5A5A5A;
+  }
 }
 
 .row.headers {