Small changes on All_Mashups
authorveltr
Fri, 30 Nov 2012 16:59:36 +0100
changeset 88 1752b5e824ed
parent 87 32629f6a3b82
child 89 c4ee4cab84d3
Small changes on All_Mashups
integration/css/profil.css
src/hashcut/static/hashcut/bpi/css/common.css
src/hashcut/static/hashcut/bpi/css/profil.css
src/hashcut/static/hashcut/iri/css/common.css
src/hashcut/static/hashcut/iri/css/profil.css
src/hashcut/templates/bpi_mashup_all_mashups.html
src/hashcut/templates/iri_mashup_all_mashups.html
src/hashcut/views.py
--- a/integration/css/profil.css	Fri Nov 30 16:49:12 2012 +0100
+++ b/integration/css/profil.css	Fri Nov 30 16:59:36 2012 +0100
@@ -8,3 +8,7 @@
 .profil .video-item:nth-child(3n+3){
 	margin-right: 0;
 }
+
+.pagination {
+    padding-top: 10px;
+}
--- a/src/hashcut/static/hashcut/bpi/css/common.css	Fri Nov 30 16:49:12 2012 +0100
+++ b/src/hashcut/static/hashcut/bpi/css/common.css	Fri Nov 30 16:59:36 2012 +0100
@@ -415,7 +415,6 @@
     color: #C81000;
 }
 .pagination{
-	padding: 0 0 20px;
 	text-align: center;
 }
 .pagination a{
@@ -890,7 +889,7 @@
 /* Social Share Widget */
 
 .Ldt-Social {
-    float: left; margin-top: 10px;
+    float: left; margin-top: 8px;
 }
 
 .Ldt-Social a {
--- a/src/hashcut/static/hashcut/bpi/css/profil.css	Fri Nov 30 16:49:12 2012 +0100
+++ b/src/hashcut/static/hashcut/bpi/css/profil.css	Fri Nov 30 16:59:36 2012 +0100
@@ -8,3 +8,7 @@
 .profil .video-item:nth-child(3n+3){
 	margin-right: 0;
 }
+
+.pagination {
+    padding-top: 10px;
+}
--- a/src/hashcut/static/hashcut/iri/css/common.css	Fri Nov 30 16:49:12 2012 +0100
+++ b/src/hashcut/static/hashcut/iri/css/common.css	Fri Nov 30 16:59:36 2012 +0100
@@ -415,7 +415,6 @@
     color: #C81000;
 }
 .pagination{
-	padding: 0 0 20px;
 	text-align: center;
 }
 .pagination a{
@@ -890,7 +889,7 @@
 /* Social Share Widget */
 
 .Ldt-Social {
-    float: left; margin-top: 10px;
+    float: left; margin-top: 8px;
 }
 
 .Ldt-Social a {
--- a/src/hashcut/static/hashcut/iri/css/profil.css	Fri Nov 30 16:49:12 2012 +0100
+++ b/src/hashcut/static/hashcut/iri/css/profil.css	Fri Nov 30 16:59:36 2012 +0100
@@ -8,3 +8,7 @@
 .profil .video-item:nth-child(3n+3){
 	margin-right: 0;
 }
+
+.pagination {
+    padding-top: 10px;
+}
--- a/src/hashcut/templates/bpi_mashup_all_mashups.html	Fri Nov 30 16:49:12 2012 +0100
+++ b/src/hashcut/templates/bpi_mashup_all_mashups.html	Fri Nov 30 16:59:36 2012 +0100
@@ -14,7 +14,9 @@
     <div class="header">
     {% include 'partial/bpi_mashup_popin_user.html' %}
     {% include 'partial/bpi_hashcut_logo.html' %}
-        <div class="title-header"></div>
+        <div class="title-video-wrap">
+            <p class="title-video" href="#">Tous les Hashcuts</p>
+        </div>
         <div class="profil-wrap">
             <ul>
                 <li><a href="{% url mashup_home branding=branding %}" class="all-hashcut">Accueil</a></li>
@@ -28,7 +30,6 @@
 
 {% block content %}
 <div class="content">
-    <h2 class="title-content">Tous les Hashcuts</h2>
     
     <div class="pagination">
             {% if results.has_previous %}
--- a/src/hashcut/templates/iri_mashup_all_mashups.html	Fri Nov 30 16:49:12 2012 +0100
+++ b/src/hashcut/templates/iri_mashup_all_mashups.html	Fri Nov 30 16:59:36 2012 +0100
@@ -14,7 +14,9 @@
     <div class="header">
     {% include 'partial/iri_mashup_popin_user.html' %}
     {% include 'partial/iri_hashcut_logo.html' %}
-        <div class="title-header"></div>
+        <div class="title-video-wrap">
+            <p class="title-video" href="#">Tous les Hashcuts</p>
+        </div>
         <div class="profil-wrap">
             <ul>
                 <li><a href="{% url mashup_home branding=branding %}" class="all-hashcut">Accueil</a></li>
@@ -28,7 +30,6 @@
 
 {% block content %}
 <div class="content">
-    <h2 class="title-content">Tous les Hashcuts</h2>
     
     <div class="pagination">
             {% if results.has_previous %}
--- a/src/hashcut/views.py	Fri Nov 30 16:49:12 2012 +0100
+++ b/src/hashcut/views.py	Fri Nov 30 16:59:36 2012 +0100
@@ -268,7 +268,7 @@
         brd = Branding.objects.get(name=self.branding)
         
         mashups = Mashup.objects.filter(branding=brd)
-        nb = getattr(settings, 'LDT_FRONT_MEDIA_PER_PAGE', 9)
+        nb = 3#getattr(settings, 'LDT_FRONT_MEDIA_PER_PAGE', 9)
         if page=="x":
             nb = mashups.count()