add soulmate view

refactoring some tags labels add chosen for face to face section add classes
ciudadanointeligente · Sep 11, 2013 · 01bafea · 01bafea
1 parent b4ffdcc
commit 01bafea
Show file tree

Hide file tree

Showing 13 changed files with 497 additions and 58 deletions.
diff --git a/elections/static/css/chosen.min.css b/elections/static/css/chosen.min.css
diff --git a/elections/static/css/main.css b/elections/static/css/main.css
@@ -50,6 +50,7 @@ ul.list-inline {
 .nav-candidator {
 	background-color: #FFF;
 	text-align: center;
+	margin-bottom: 15px;
 }
 
 .navbar-inverse {
@@ -121,14 +122,51 @@ eof profile
 }
 */
 
+/*face-to-face*/
+.progress-bar .fondo {
+	background-color: #000
+}
+/*EOF face-to-face*/
+
+/*soulmate*/
+.other-soulmate-box {
+	background-color: #FFF;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	padding: 1px 15px;
+}
+/*EOF soulmate*/
+
 #footer {
 	padding-top: 10px;
 	color: #FFF;
 	background-color: #323a45;
 }
 
 @media (max-width: 480px) {
+	/* menu */
+	.list-inline>li {
+		padding: 0px;
+		margin: 5px 0px;
+	}
+
+	.list-inline>li a {
+		background: #FFF;
+		border-right: 0px solid #eaedf2;
+		padding: 0px 5px;
+	}
+
+	.list-inline>li:first-child a {
+		border-left: 0px solid #eaedf2;
+	}
+	/* eof menu */
+
 	.profile-candidate {
 		min-height: 425px;
 	}
+
+	.other-soulmate-box {
+		margin-top: 5px;
+	}
 }
diff --git a/elections/static/js/vendor/chosen.jquery.min.js b/elections/static/js/vendor/chosen.jquery.min.js
diff --git a/elections/templates/base.html b/elections/templates/base.html
@@ -17,6 +17,7 @@
             }
         </style>
         <link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
+        <link rel="stylesheet" href="{% static 'css/chosen.min.css' %}" rel="stylesheet">
         <link rel="stylesheet" href="{% static 'css/main.css' %}">
     </head>
 
@@ -71,8 +72,8 @@
         window.jQuery || document.write('<script src="js/vendor/jquery-1.10.1.min.js"><\/script>')
         </script>
 
-        <script src="{% static 'js/vendor/angular.js' %}"></script>
-        <script src="{% static 'js/removeDiacritics.js' %}"></script>
+        <!--script src="{% static 'js/vendor/angular.js' %}"></script>
+        <script src="{% static 'js/removeDiacritics.js' %}"></script-->
 
         <script src="{% static 'js/main.js' %}"></script>
         <script type="text/javascript">
@@ -82,7 +83,12 @@
 
         <!-- Latest compiled and minified JavaScript -->
         <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
-
+        <script src="{% static 'js/vendor/chosen.jquery.min.js' %}" type="text/javascript"></script>
+        <script>
+         $(document).ready(function(){
+            $(".chosen-select").chosen();
+         })
+        </script>
         <script>
             var _gaq=[['_setAccount','UA-XXXXX-X'],['_trackPageview']];
             (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];

diff --git a/elections/templates/elections/candidate_detail.html b/elections/templates/elections/candidate_detail.html
@@ -1,6 +1,7 @@
 {% extends "elections/election_base.html" %}
 {% load candideitorg_templetags %}
 {% load i18n %}
+{% block url_face_to_face %}{% url 'face_to_face_one_candidate_detail_view' slug=election.slug slug_candidate_one=candidate.slug %}{% endblock url_face_to_face %}
 
 {% block mainelection %}
 
@@ -12,7 +13,7 @@ <h2>{{ candidate.name }}</h2>
 		<div class="profile-candidate">
 			<div class="row">
 				<div class="col-md-3">
-					<img src="{{ candidate.photo }}" class="img-responsive img-profile" alt="{{ candidate.name }}">
+					<img src="http://placehold.it/800x600" class="img-responsive img-profile" alt="{{ candidate.name }}">
 				</div>
 				<div class="col-md-6">
 					<table class="table">