Commits

powersurge360 committed 94f66b3 Merge with conflicts

Merge branch 'master' of ssh://bitbucket.org/powersurge360/share_search

Conflicts:
share_search/reviews/templates/reviews/store_detail.html

Comments (0)

Files changed (8)

share_search/reviews/templates/reviews/products.html

                                 <div class="span3">
                                     <a href="{{ column.get_absolute_url }}">
                                         <img src="{{ column.image.url }}">
-                                        <center>{{ column.name }}</center>
+                                        <center><a href="{{ column.get_absolute_url }}" class="btn btn-block">{{ column.name }}</a></center>
                                     </a>
                                 </div>
                             {% endfor %}

share_search/reviews/templates/reviews/store_list.html

                     <div class="row">
                         <div class="offset2">
                             {% for column in row %}
-                                <div class="span3 col">
+                                <div class="span3">
+                                    <img src="{{ column.image.url }}">
                                     <a class="btn btn-block" href="{{ column.get_absolute_url }}">
                                         {{ column.name }}
                                     </a>

share_search/staticfiles/img/Slide 1.png

Added
New image

share_search/staticfiles/img/Slide 2.png

Added
New image

share_search/staticfiles/img/Slide 3.png

Added
New image

share_search/staticfiles/img/Slide 4.png

Added
New image

share_search/staticfiles/img/Slide 5.png

Added
New image

share_search/templates/semi_static/home.html

     <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
     <li data-target="#myCarousel" data-slide-to="1"></li>
     <li data-target="#myCarousel" data-slide-to="2"></li>
+    <li data-target="#myCarousel" data-slide-to="3"></li>
+    <li data-target="#myCarousel" data-slide-to="4"></li>
   </ol>
   <!-- Carousel items -->
   <div class="carousel-inner">
     <div class="active item">
-    	<center><img src="{{ STATIC_URL }}img/guitar.jpg"></center>
+    	<center><img src="{{ STATIC_URL }}img/Slide 1.png"></center>
     </div>
     <div class="item">
-    	<center><img src="{{ STATIC_URL }}img/iphonecase.jpg"		width = "500" height = "750"></center>
-	</div>
+    	<center><img src="{{ STATIC_URL }}img/Slide 2.png"></center>
+	  </div>
     <div class="item after that">
-    	<center><img src="{{ STATIC_URL }}img/toeshoes.jpg"	width = "500" height = "750"></center>
-	</div>
+    	<center><img src="{{ STATIC_URL }}img/Slide 3.png"></center>
+	  </div>
+    <div class="item after that">
+      <center><img src="{{ STATIC_URL }}img/Slide 4.png"></center>
+    </div>
+    <div class="item after that">
+      <center><img src="{{ STATIC_URL }}img/Slide 5.png"></center>
+    </div>
   </div>
   <!-- Carousel nav -->
   <a class="carousel-control left" href="#myCarousel" data-slide="prev">&lsaquo;</a>