Merge pull request #1 from ppasq/api-search

Add Bootstrap 3.1.1 and Fontawesome 4.0.3

geonode/layers/templates/layers/_actions.html

@@ -1,11 +1,10 @@
 {% load i18n %}
 <ul class="nav nav-tabs">
-  <li class="active"><a href="#info" data-toggle="tab"><i class="icon-info-sign"></i>{% trans "Info" %}</a></li>
-  <li><a href="#attributes" data-toggle="tab"><i class="icon-list"></i>{% trans "Attributes" %}</a></li>
-{% if SOCIAL_BUTTONS %}
-  <li><a href="#share" data-toggle="tab"><i class="icon-share"></i>{% trans "Share" %}</a></li>
-{% endif %}
-  <!--li><a href="#flag" data-toggle="tab"><i class="icon-flag"></i>{% trans "Flag" %}</a></li-->
-  <li><a href="#rate" data-toggle="tab"><i class="icon-star"></i>{% trans "Ratings" %}</a></li>
-  <li><a href="#comments" data-toggle="tab"><i class="icon-comment"></i> {% trans "Comments" %}</a></li>
+  <li class="active"><a href="#info" data-toggle="tab"><i class="fa fa-info-circle"></i>{% trans "Info" %}</a></li>
+  <li><a href="#attributes" data-toggle="tab"><i class="fa fa-bars"></i>{% trans "Attributes" %}</a></li>
+  {% if SOCIAL_BUTTONS %}
+  <li><a href="#share" data-toggle="tab"><i class="fa fa-share"></i>{% trans "Share" %}</a></li>
+  {% endif %}
+  <li><a href="#rate" data-toggle="tab"><i class="fa fa-star"></i>{% trans "Ratings" %}</a></li>
+  <li><a href="#comments" data-toggle="tab"><i class="fa fa-comment-o"></i> {% trans "Comments" %}</a></li>
 </ul>

geonode/layers/templates/layers/_layer_filters.html

@@ -9,7 +9,7 @@
   <li>
     <form action="." class="form-inline">
       <label for="">{% trans "sort by:" %}</label>
-      <select name="sort" id="layer_sort" class="span1">
+      <select name="sort" id="layer_sort" class="col-md-1">>
         <option value="">{% trans "Newest" %}</option>
         <option value="">{% trans "Popularity" %}</option>
       </select>

geonode/layers/templates/layers/layer_base.html

@@ -7,14 +7,12 @@
 {% block body_class %}data{% endblock %}
 
 {% block body_outer %}
-    <div class="span12">
-      <!--nav class="back"><a href="{% url "layer_browse" %}"><i class="icon-chevron-left"></i> See all Layers</a></nav-->
-      <ul class="nav nav-tabs" id="subnav-tabs">
-            <li><a href="{% url "layer_browse" %}" class="explore">{% trans "Explore Layers" %}</a></li>
-            <!-- switch to us the new upload -->
-            <li><a href="{% url "layer_upload" %}" class="upload">{% trans "Upload Layers" %}</a></li>
-      </ul>
-    </div>
-    {% block body %}{% endblock body %}
-    {% block sidebar %}{% endblock sidebar %}
+  <div class="col-md-12">
+    <ul class="nav nav-tabs" id="subnav-tabs">
+      <li><a href="{% url "layer_browse" %}" class="explore">{% trans "Explore Layers" %}</a></li>
+      <li><a href="{% url "layer_upload" %}" class="upload">{% trans "Upload Layers" %}</a></li>
+    </ul>
+  </div>
+  {% block body %}{% endblock body %}
+  {% block sidebar %}{% endblock sidebar %}
 {% endblock body_outer %}

geonode/layers/templates/layers/layer_detail.html

@@ -26,10 +26,10 @@
 {% block body_class %}data{% endblock %}
 
 {% block body_outer %}
-  <div class="span5">
+  <div class="col-md-5">
     <h2 class="page-title">{{ layer.title|default:layer.typename }}</h2>
   </div>
-  <div class="span7 action-group">
+  <div class="col-md-7 action-group">
     <div class="btn-group pull-right">
       <!-- download layer -->
       <div class="btn-group">
@@ -83,12 +83,12 @@ <h2 class="page-title">{{ layer.title|default:layer.typename }}</h2>
       {% endif %}
     </div>
   </div>
-  <div class="span12">
+  <div class="col-md-12">
     <div id="embedded_map" class="mrg-btm">
         <div id="preview_map"></div>
     </div>
   </div>
-  <div class="span8">
+  <div class="col-md-8">
     <div class="layer-actions">
       {% include "layers/_actions.html" %}
     </div>
@@ -159,7 +159,7 @@ <h3>{% trans 'Average Rating' %}</h3>
       </article>
     </div>
   </div>
-  <aside class="span4">
+  <div class="col-md-4">
 
     {% if layer.get_legend %}
 <div class="well">

geonode/layers/templates/layers/layer_list.html

@@ -9,7 +9,7 @@
 {% block body_class %}data data-list explore{% endblock %}
 
 {% block body %}
-  <div class="span12">
+  <div class="col-md-12">
     <h2 class="page-title">{% trans "Explore Layers" %}</h2>
   </div>
   {% with include_type_filter='true' %}

geonode/layers/templates/layers/layer_remove.html

@@ -5,7 +5,7 @@
 
 {% block body %}
 <div class="row">
-  <div class="span8">
+  <div class="col-md-8">
     <form action="{% url "layer_remove" layer.typename %}" method="POST">
       <h2>
         {% blocktrans with layer.typename as layer_title %}
@@ -20,7 +20,7 @@ <h2>
       </div>
     </form>
   </div>
-  <div class="span4">
+  <div class="col-md-4">
   <ul class="nav nav-list">
     <li class="nav-header">{% trans "This action affects the following maps:" %}</li>
     {% for map in layer.maps %}

geonode/layers/templates/layers/layer_replace.html

@@ -15,19 +15,19 @@
 
 {% block body %}
   <div class="block">
-    <div class="span8">
+    <div class="col-md-8">
       <h2 class="page-title">{% trans "Replace Layer: " %}{{ layer.title }}</h2>
 
         {% if incomplete %}
         <section class="widget" id="incomplete-download-list">
-          <h2>{% trans "Incomplete Uploads" %}</h2>
+          <h3>{% trans "Incomplete Uploads" %}</h3>
           <p>{% trans "You have the following incomplete uploads" %}:</p>
           {% for u in incomplete %}
           <div class="clearfix uip" id="incomplete-{{ u.import_id }}">
             <div class="pull-left">{{ u.name }}, {% trans "last updated on" %} {{ u.date }}</div>
             <div class="upload_actions pull-right">
               <a class="btn btn-mini" href="#" id="resume-{{ u.import_id }}">{% trans "Resume" %}</a>
-              <a class="btn btn-mini" href="#" id="delete-{{ u.import_id }}"><i class="icon-trash"></i> {% trans "Delete" %}</a>
+              <a class="btn btn-mini" href="#" id="delete-{{ u.import_id }}"><i class="fa fa-trash-o"></i> {% trans "Delete" %}</a>
             </div>
           </div>
           {% endfor %}
@@ -53,7 +53,7 @@ <h2>{% trans "Incomplete Uploads" %}</h2>
         {% endif %}
 
         <section id="drop-zone">
-          <h2><i class="icon-upload-alt"></i><br />{% trans "Drop files here" %}</h2>
+          <h3><i class="icon-upload-alt"></i><br />{% trans "Drop files here" %}</h3>
         </section>
 
         <p>{% trans " or select them one by one:" %}</p>
@@ -82,7 +82,7 @@ <h2>{% trans "Files to be uploaded" %}</h2>
 <h3>{% trans "Permissions"  %}</h3>
 <div>
   <form id="permission_form">
-        {% include "_permissions.html" %}
+    {% include "_permissions.html" %}
   </form>
 </div>
 {% endblock %}

geonode/layers/templates/layers/layer_style_manage.html

@@ -10,20 +10,22 @@
 <div class="alert alert-error">{{ error }}</div>
 {% endif %}
 
-<div class="span12 select-style">
+<div class="col-md-12 select-style">
   <h2 class="page-title">{% trans "Manage Styles" %}</h2>
   <h3>
     {% blocktrans with layer.typename as layer_title %}
       Manage Available Styles for <a href="/layers/{{ layer_title }}">{{ layer_title }}</a>
     {% endblocktrans %}
   </h3>
 </div>
+
 <form action="{% url "layer_style_manage" layer.typename %}" method="POST">
+
   <fieldset>
-    <div class="span3">
+    <div class="col-md-3">
       <h3>{% trans "Layer Default Style" %}</h3>
     </div>
-    <div class="span9">
+    <div class="col-md-9">
       <select id='default_style' name='default_style'>
       {% for style in layer_styles %}
         {% if style = layer.default_style.name %}
@@ -35,12 +37,13 @@ <h3>{% trans "Layer Default Style" %}</h3>
       </select>
     </div>
   </fieldset>
+
   <fieldset>
-    <div class="span3">
+    <div class="col-md-3">
       <h3>{% trans "Available styles" %}</h3>
       <p>{% trans "Click on an available style in the upper box to assign it to this layer. Selected styles appear in the lower box." %}</p>
     </div>
-    <div class="span9">
+    <div class="col-md-9">
       <select multiple="multiple" id="style-select" name="style-select">
         {% for style in gs_styles %}
           {% if style in layer_styles %}
@@ -54,12 +57,13 @@ <h3>{% trans "Available styles" %}</h3>
         <input type="hidden" value="{{ layer.typename }}" />
     </div>
   </fieldset>
-      <div class="form-actions">
-        <input type="submit" value="{% trans "Update Available Styles" %}" class="btn btn-danger" />
-      </div>
-    </div>
-  </form>
-</div>
+
+  <div class="form-actions">
+    <input type="submit" value="{% trans "Update Available Styles" %}" class="btn btn-danger" />
+  </div>
+
+</form>
+
 {% endblock %}
 {% block extra_script %}
 <script type="text/javascript">