# HG changeset patch
# User cavaliet
# Date 1354113085 -3600
# Node ID 45416f40602e45c606320f5447c9abfdef277eff
# Parent  57a5ecd3ef5996cb7ccaba865ac2cd24c468cbb6
enhance template management

diff -r 57a5ecd3ef59 -r 45416f40602e src/hashcut/templates/bpi_mashup_edit.html
--- a/src/hashcut/templates/bpi_mashup_edit.html	Wed Nov 28 13:31:00 2012 +0100
+++ b/src/hashcut/templates/bpi_mashup_edit.html	Wed Nov 28 15:31:25 2012 +0100
@@ -13,76 +13,7 @@
 {% block wrap_header %}
 <div class="wrap-header"> 
     <div class="header">
-
-    <!-- popin user -->
-    
-        <div class="popin user info" id="user">
-            <div class="pointer"></div>
-            <div class="popin-content">
-                <h2>Mashup75</h2>
-                <h3>mash@cinecast.fr</h3>
-                <a href="#" class="nb-hashcut">12 Hashcuts</a>
-                <p>
-                    <a href="#" class="change-account button">Changer de compte</a>
-                </p>
-            </div>
-        </div><!-- popin user info-->
-
-        <div class="popin user signup" id="user">
-            <div class="pointer"></div>
-            <div class="popin-content">
-                <h2>Créer un compte :</h2>
-                <form action="#" class="signup-form">
-                    <p>
-                        <label for="signup-pseudo">Pseudonyme : </label>
-                        <input type="text" id="signup-pseudo" name="" />
-                    </p>
-                    <p >
-                        <label for="signup-email">Email : </label>
-                        <input type="text" id="signup-email" name="" />
-                    </p>
-                    <p >
-                        <label for="signup-password">Mot de passe : </label>
-                        <input type="password" id="signup-password" name="" />
-                    </p>
-                    <p>
-                        <label for="signup-password">Confirmer le mot de passe : </label>
-                        <input type="password" id="signup-password" name="" />
-                    </p>
-                    <p>
-                        <input class="button" type="submit" value="Créer le compte">
-                    </p>
-                </form>
-
-            </div>
-        </div><!-- popin user signup-->
-
-        <div class="popin user login" id="user">
-            <div class="pointer"></div>
-            <div class="popin-content">
-                <h2>Connexion :</h2>
-                <form action="#" class="login-form">
-                    <p>
-                        <label for="signup-pseudo">E-mail : </label>
-                        <input type="text" id="signup-pseudo" name="" />
-                    </p>
-                    <p >
-                        <label for="signup-email">Mot de passe : </label>
-                        <input type="password" id="signup-email" name="" />
-                    </p>
-                    <p>
-                        <input class="button" type="submit" value="Se connecter">
-                    </p>
-                    <p>
-                        <a class="button signup-button" href="#">Créer un compte</a>
-                    </p>
-                </form>
-
-            </div>
-        </div><!-- popin user login-->
-        
-    <!-- /popin user -->
-    
+    {% include 'partial/bpi_mashup_popin_user.html' %}
     <!-- popin update-title -->
         <div class="popin update-title" id="update-title">
             <div class="pointer"></div>
@@ -101,10 +32,8 @@
         </div>
     <!-- /popin update-title -->
         
-        <h1><a title="Hashcut - Le Mashup cliquable" class="clearfix" href="#">
-            <img src="{% static 'hashcut/bpi/img/hashcut-logo.png' %}" alt="Hashcut" />
-            <span>Le Mashup<br />Cliquable</span>
-        </a></h1>
+    {% include 'partial/bpi_hashcut_logo.html' %}
+    
         <div class="title-video-wrap">
             <p class="title-video">
                 <a title="Modifier le titre et la description" class="open-popin" href="#update-title">Hashcut sans titre</a>
@@ -113,7 +42,7 @@
         </div>
         <div class="profil-wrap">
 	        <ul class="space-top">
-	            <li><a href="#" class="all-hashcut">Tous les Hashcuts</a></li>
+	            <li><a href="{% url mashup_home branding=branding %}" class="all-hashcut">Tous les Hashcuts</a></li>
 	            <li><a href="#user" class="my-profil open-popin">Mon profil</a></li>
 	        </ul>
 	    </div>
diff -r 57a5ecd3ef59 -r 45416f40602e src/hashcut/templates/bpi_mashup_hashcut.html
--- a/src/hashcut/templates/bpi_mashup_hashcut.html	Wed Nov 28 13:31:00 2012 +0100
+++ b/src/hashcut/templates/bpi_mashup_hashcut.html	Wed Nov 28 15:31:25 2012 +0100
@@ -12,79 +12,8 @@
 {% block wrap_header %}
 <div class="wrap-header">  
     <div class="header">
-
-    <!-- popin user -->
-        <div class="popin user info" id="user">
-            <div class="pointer"></div>
-            <div class="popin-content">
-                <h2>Mashup75</h2>
-                <h3>mash@cinecast.fr</h3>
-                <a href="#" class="nb-hashcut">12 Hashcuts</a>
-                <p>
-                    <a href="#" class="change-account button">Changer de compte</a>
-                </p>
-            </div>
-        </div><!-- popin user info-->
-
-        <div class="popin user signup" id="user">
-            <div class="pointer"></div>
-            <div class="popin-content">
-                <h2>Créer un compte :</h2>
-                <form action="#" class="signup-form">
-                    <p>
-                        <label for="signup-pseudo">Pseudonyme : </label>
-                        <input type="text" id="signup-pseudo" name="" />
-                    </p>
-                    <p>
-                        <label for="signup-email">Email : </label>
-                        <input type="text" id="signup-email" name="" />
-                    </p>
-                    <p>
-                        <label for="signup-password">Mot de passe : </label>
-                        <input type="password" id="signup-password" name="" />
-                    </p>
-                    <p>
-                        <label for="signup-password">Confirmer le mot de passe : </label>
-                        <input type="password" id="signup-password" name="" />
-                    </p>
-                    <p>
-                        <input class="button" type="submit" value="Créer le compte">
-                    </p>
-                </form>
-
-            </div>
-        </div><!-- popin user signup-->
-
-        <div class="popin user login" id="user">
-            <div class="pointer"></div>
-            <div class="popin-content">
-                <h2>Connexion :</h2>
-                <form action="#" class="login-form">
-                    <p>
-                        <label for="signup-pseudo">E-mail : </label>
-                        <input type="text" id="signup-pseudo" name="" />
-                    </p>
-                    <p >
-                        <label for="signup-email">Mot de passe : </label>
-                        <input type="password" id="signup-email" name="" />
-                    </p>
-                    <p>
-                        <input class="button" type="submit" value="Se connecter">
-                    </p>
-                    <p>
-                        <a class="button signup-button" href="#">Créer un compte</a>
-                    </p>
-                </form>
-
-            </div>
-        </div><!-- popin user login-->
-        
-    <!-- /popin user -->
-    
-        <h1><a title="Hashcut - Le Mashup cliquable" class="clearfix" href="#">
-            <img src="{% static 'hashcut/bpi/img/hashcut-logo.png' %}" alt="Hashcut" />
-            <span>Le Mashup<br />Cliquable</span>
-        </a></h1>
+        {% include 'partial/bpi_mashup_popin_user.html' %}
+        {% include 'partial/bpi_hashcut_logo.html' %}
         <div class="title-video-wrap">
             <div class="Ldt-Social">
                 <div class="Ldt-Social-Url-Container">
@@ -103,8 +32,8 @@
         </div>
         <div class="profil-wrap">
             <ul>
-                <li><a href="#" class="all-hashcut">Tous les Hashcuts</a></li>
-                <li><a href="edition.html" class="new-hashcut">Créer un Hashcut</a></li>
+                <li><a href="{% url mashup_home branding=branding %}" class="all-hashcut">Tous les Hashcuts</a></li>
+                <li><a href="{% url mashup_edit branding=branding %}" class="new-hashcut">Créer un Hashcut</a></li>
                 <li><a href="#user" class="my-profil open-popin">Mon profil</a></li>
             </ul>
         </div>
diff -r 57a5ecd3ef59 -r 45416f40602e src/hashcut/templates/bpi_mashup_home.html
--- a/src/hashcut/templates/bpi_mashup_home.html	Wed Nov 28 13:31:00 2012 +0100
+++ b/src/hashcut/templates/bpi_mashup_home.html	Wed Nov 28 15:31:25 2012 +0100
@@ -37,79 +37,8 @@
 {% block wrap_header %}
 <div class="wrap-header">
     <div class="header">
-    
-    <!-- popin user -->
-        <!--div class="popin user info" id="user">
-            <img class="pointer" src="img/popin-triangle.png" alt="" />
-            <div class="popin-content">
-                <h2>Mashup75</h2>
-                <h3>mash@cinecast.fr</h3>
-                <a href="#" class="nb-hashcut">12 Hashcuts</a>
-                <p>
-                    <a href="#" class="change-account button">Changer de compte</a>
-                </p>
-            </div>
-        </div--><!-- popin user info-->
-
-        <!--div class="popin user signup" id="user">
-            <img class="pointer" src="img/popin-triangle.png" alt="" />
-            <div class="popin-content">
-                <h2>Créer un compte :</h2>
-                <form action="#" class="signup-form">
-                    <p>
-                        <label for="signup-pseudo">Pseudonyme : </label>
-                        <input type="text" id="signup-pseudo" name="" />
-                    </p>
-                    <p >
-                        <label for="signup-email">Email : </label>
-                        <input type="text" id="signup-email" name="" />
-                    </p>
-                    <p >
-                        <label for="signup-password">Mot de passe : </label>
-                        <input type="password" id="signup-password" name="" />
-                    </p>
-                    <p>
-                        <label for="signup-password">Confirmer le mot de passe : </label>
-                        <input type="password" id="signup-password" name="" />
-                    </p>
-                    <p>
-                        <input class="button" type="submit" value="Créer le compte">
-                    </p>
-                </form>
-
-            </div>
-        </div--><!-- popin user signup-->
-
-        <!--div class="popin user login" id="user">
-            <img class="pointer" src="img/popin-triangle.png" alt="" />
-            <div class="popin-content">
-                <h2>Connexion :</h2>
-                <form action="#" class="login-form">
-                    <p>
-                        <label for="signup-pseudo">E-mail : </label>
-                        <input type="text" id="signup-pseudo" name="" />
-                    </p>
-                    <p >
-                        <label for="signup-email">Mot de passe : </label>
-                        <input type="password" id="signup-email" name="" />
-                    </p>
-                    <p>
-                        <input class="button" type="submit" value="Se connecter">
-                    </p>
-                    <p>
-                        <a class="button signup-button" href="#">Créer un compte</a>
-                    </p>
-                </form>
-
-            </div>
-        </div--><!-- popin user login-->
-        
-    <!-- /popin user -->
-    
-        <h1><a title="Hashcut - Le Mashup cliquable" class="clearfix" href="#">
-            <img src="{% static 'hashcut/bpi/img/hashcut-logo.png' %}" alt="Hashcut" />
-            <span>Le Mashup<br />Cliquable</span>
-        </a></h1>
+        {% include 'partial/bpi_mashup_popin_user.html' %}
+        {% include 'partial/bpi_hashcut_logo.html' %}
         <div class="title-header">
             <h2><a href="{% url mashup_edit branding=branding %}">Créer un hashcut !</a></h2>
         </div>
diff -r 57a5ecd3ef59 -r 45416f40602e src/hashcut/templates/partial/bpi_hashcut_logo.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hashcut/templates/partial/bpi_hashcut_logo.html	Wed Nov 28 15:31:25 2012 +0100
@@ -0,0 +1,5 @@
+{% load static %}
+        <h1><a title="Hashcut - Le Mashup cliquable" class="clearfix" href="#">
+            <img src="{% static 'hashcut/bpi/img/hashcut-logo.png' %}" alt="Hashcut" />
+            <span>Le Mashup<br />Cliquable</span>
+        </a></h1>
\ No newline at end of file
diff -r 57a5ecd3ef59 -r 45416f40602e src/hashcut/templates/partial/bpi_mashup_popin_user.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hashcut/templates/partial/bpi_mashup_popin_user.html	Wed Nov 28 15:31:25 2012 +0100
@@ -0,0 +1,68 @@
+    <!-- popin user -->
+    
+        <div class="popin user info" id="user">
+            <div class="pointer"></div>
+            <div class="popin-content">
+                <h2>Mashup75</h2>
+                <h3>mash@cinecast.fr</h3>
+                <a href="#" class="nb-hashcut">12 Hashcuts</a>
+                <p>
+                    <a href="#" class="change-account button">Changer de compte</a>
+                </p>
+            </div>
+        </div><!-- popin user info-->
+
+        <div class="popin user signup" id="user">
+            <div class="pointer"></div>
+            <div class="popin-content">
+                <h2>Créer un compte :</h2>
+                <form action="#" class="signup-form">
+                    <p>
+                        <label for="signup-pseudo">Pseudonyme : </label>
+                        <input type="text" id="signup-pseudo" name="" />
+                    </p>
+                    <p >
+                        <label for="signup-email">Email : </label>
+                        <input type="text" id="signup-email" name="" />
+                    </p>
+                    <p >
+                        <label for="signup-password">Mot de passe : </label>
+                        <input type="password" id="signup-password" name="" />
+                    </p>
+                    <p>
+                        <label for="signup-password">Confirmer le mot de passe : </label>
+                        <input type="password" id="signup-password" name="" />
+                    </p>
+                    <p>
+                        <input class="button" type="submit" value="Créer le compte">
+                    </p>
+                </form>
+
+            </div>
+        </div><!-- popin user signup-->
+
+        <div class="popin user login" id="user">
+            <div class="pointer"></div>
+            <div class="popin-content">
+                <h2>Connexion :</h2>
+                <form action="#" class="login-form">
+                    <p>
+                        <label for="signup-pseudo">E-mail : </label>
+                        <input type="text" id="signup-pseudo" name="" />
+                    </p>
+                    <p >
+                        <label for="signup-email">Mot de passe : </label>
+                        <input type="password" id="signup-email" name="" />
+                    </p>
+                    <p>
+                        <input class="button" type="submit" value="Se connecter">
+                    </p>
+                    <p>
+                        <a class="button signup-button" href="#">Créer un compte</a>
+                    </p>
+                </form>
+
+            </div>
+        </div><!-- popin user login-->
+        
+    <!-- /popin user -->
\ No newline at end of file
diff -r 57a5ecd3ef59 -r 45416f40602e src/hashcut/views.py
--- a/src/hashcut/views.py	Wed Nov 28 13:31:00 2012 +0100
+++ b/src/hashcut/views.py	Wed Nov 28 15:31:25 2012 +0100
@@ -24,7 +24,6 @@
 
         # the branding template is supposed to override the default template. So we insert instead of append
         if self.branding and self.branding != "":
-            #names.insert(0,"%s_%s" % (self.branding, self.template_name))
             names.insert(0,"%s_%s" % (self.branding, self.template_suffix))
         
         return names
@@ -61,7 +60,6 @@
 
         # the branding template is supposed to override the default template. So we insert instead of append
         if self.branding and self.branding != "":
-            #names.insert(0,"%s_%s" % (self.branding, self.template_name))
             names.insert(0,"%s_%s" % (self.branding, self.template_suffix))
         
         return names
@@ -93,7 +91,6 @@
 
         # the branding template is supposed to override the default template. So we insert instead of append
         if self.branding and self.branding != "":
-            #names.insert(0,"%s_%s" % (self.branding, self.template_name))
             names.insert(0,"%s_%s" % (self.branding, self.template_suffix))
         
         return names
@@ -102,9 +99,6 @@
         self.branding = branding
         if not ldt_id:
             return HttpResponseNotFound("A project id must be given.")
-#        project = Project.objects.get(ldt_id=ldt_id)
-#        if not project:
-#            return HttpResponseNotFound("Project not found.")
         context = {"branding":self.branding, "ldt_id":ldt_id}
         return self.render_to_response(context)