Merge pull request GeoNode#4 from ppasq/api-search

Disable responsiveness and template fixes
ppasq · May 14, 2014 · 7868362 · 7868362
2 parents 2429de4 + 096c5aa
commit 7868362
Show file tree

Hide file tree

Showing 37 changed files with 227 additions and 156 deletions.
diff --git a/geonode/base/templates/base/_resourcebase_snippet.html b/geonode/base/templates/base/_resourcebase_snippet.html
@@ -1,11 +1,8 @@
 {% verbatim %}
   <article ng-repeat="item in results">
-    <div class="content">
-      <div class="item-header">
-        <a href="{{ item.absolute__url }}">{{ item.title }}
-          <img class="thumb" ng-src="{{ item.thumbnail_url }}" />
-        </a>
-      </div>
+  	<img class="thumb" ng-src="{{ item.thumbnail_url }}" />
+    <div class="item-header">
+      <a href="{{ item.absolute__url }}">{{ item.title }}</a>
     </div>
   </article>
 {% endverbatim %}
diff --git a/geonode/contrib/groups/templates/groups/_group_list_item.html b/geonode/contrib/groups/templates/groups/_group_list_item.html
@@ -6,15 +6,15 @@
       <div ng-if="group.logo != ''" class="avatar"><img ng-src="{{ group.logo }}" alt="{{ group.title }}" class="group-logo" /></div>
 
       <div class="avatar"><div class="img-missing"></div></div>
-      <h3><i class="icon-group"></i> <a href="{{ group.detail_url }}">{{ group.title }}</a>
-      </h3>
+
+      <h3><i class="fa fa-group"></i> <a href="{{ group.detail_url }}">{{ group.title }}</a></h3>
     </div>
     <div class="details">
       <div class="meta">
         <p class="abstract">
           {{ group.description}}
         </p>
-          <ul class="nav stats" style="margin-left:0px">
+          <ul class="nav stats">
             <li><a href="{{ group.detail_url }}">
               <strong>{{ group.member_count }}</strong>
               <ng-pluralize count="group.member_count" when="{'1': 'Member', 'other': 'Members'}">

diff --git a/geonode/contrib/groups/templates/groups/group_base.html b/geonode/contrib/groups/templates/groups/group_base.html
@@ -8,14 +8,14 @@
 
 {% block body_outer %}
     {% block subnav %}
-    <div class="span12">
+    <div class="col-md-12">
       <ul class="nav nav-tabs" id="subnav-tabs">
-            <li><a href="{% url "group_list" %}" class="explore">{% trans "Explore Groups" %}</a></li>
-            <li><a href="{% url "group_create" %}" class="create">{% trans "Create a Group" %}</a></li>
-            {% if group %}
-            <li><a href="{% url "group_update" group.slug %}" class="update">{% trans "Update Group" %}</a></li>
-            <li><a href="{% url "group_remove" group.slug %}" class="remove">{% trans "Remove Group" %}</a></li>
-            {% endif %}
+        <li><a href="{% url "group_list" %}" class="explore">{% trans "Explore Groups" %}</a></li>
+        <li><a href="{% url "group_create" %}" class="create">{% trans "Create a Group" %}</a></li>
+        {% if group %}
+        <li><a href="{% url "group_update" group.slug %}" class="update">{% trans "Update Group" %}</a></li>
+        <li><a href="{% url "group_remove" group.slug %}" class="remove">{% trans "Remove Group" %}</a></li>
+        {% endif %}
       </ul>
     </div>
     {% endblock subnav %}

diff --git a/geonode/contrib/groups/templates/groups/group_create.html b/geonode/contrib/groups/templates/groups/group_create.html
@@ -6,16 +6,16 @@
 
 {% block body %}
     <div class="block">
-        <div class="span10">
-          <h2 class="page-title">{% trans "Create a Group" %}</h2>
-          {% if errors %}
-            <div id="errors">
-              {% for error in errors %}
-                <div style="color:#FF0000;">{{ error }}</div>
-              {% endfor %}
-            </div>
-          {% endif %}
-            <div>
+      <div class="col-md-10">
+        <h2 class="page-title">{% trans "Create a Group" %}</h2>
+        {% if errors %}
+          <div id="errors">
+            {% for error in errors %}
+              <div>{{ error }}</div>
+            {% endfor %}
+          </div>
+        {% endif %}
+        <div>
         <form class="uniForm" id="form" method="POST" action="" enctype="multipart/form-data">
         {% csrf_token %}
         <fieldset>

diff --git a/geonode/contrib/groups/templates/groups/group_detail.html b/geonode/contrib/groups/templates/groups/group_detail.html
@@ -7,10 +7,10 @@
 {% block body_class %}groups{% endblock %}
 
 {% block body_outer %}
-  <div class="span6">
+  <div class="col-md-6">
     <h2 class="page-title">{{ object.title|default:object.slug }}</h2>
   </div>
-  <div class="span4 action-group pull-right">
+  <div class="col-md-4 action-group pull-right">
 
     {% if is_manager %}
     <div class="btn-group pull-right">
@@ -29,8 +29,8 @@ <h2 class="page-title">{{ object.title|default:object.slug }}</h2>
     </div>
   {% endif %}
   </div>
-  <div class="span8 content">
-  <h2>{% trans "Members" %}</h2>
+  <div class="col-md-8 content">
+  <h3>{% trans "Members" %}</h3>
   {% include 'search/_pagination.html' %}
   <div class="tab-content paginate paginate-auto" id="search-content">
     {% include 'people/_profile_list_item.html' %}
@@ -39,7 +39,7 @@ <h2>{% trans "Members" %}</h2>
 
 
   </div>
-  <aside class="span4">
+  <aside class="col-md-4">
 
       <!-- sidebar -->
   <div class="well">

diff --git a/geonode/contrib/groups/templates/groups/group_list.html b/geonode/contrib/groups/templates/groups/group_list.html
@@ -7,26 +7,26 @@
 {% block body_class %}groups groups-list explore{% endblock %}
 
 {% block body %}
-    <div class="span12">
+    <div class="col-md-12">
       <h2 class="page-title">{% trans "Explore Groups" %}</h2>
     </div>
-    <div class="span8 filter">
+    <div class="col-md-8 filter">
       <ul class="nav nav-pills filter" id="sort">
         <li><a data-value="-last_modified" data-filter="order_by" class="selected" ng-click="single_choice_listener($event)">{% trans "Most recent" %}</a></li>
         <li><a data-value="last_modified" data-filter="order_by" ng-click="single_choice_listener($event)">{% trans "Less recent" %}</a></li>
         <li><a data-value="title" data-filter="order_by" ng-click="single_choice_listener($event)">{% trans "A - Z" %}</a></li>
         <li><a data-value="-title" data-filter="order_by" ng-click="single_choice_listener($event)">{% trans "Z - A" %}</a></li>
       </ul>
     </div>
-    <div class="span4">
+    <div class="col-md-4">
       <div class="pull-right" data-viewby="list">
         {% include "_viewby.html" %}
       </div>
     </div>
-    <div class="span12">
+    <div class="col-md-12">
       <div class="row" id="contain-slider">
         {% include 'search/_pagination.html' %}
-        <div class="tab-content span8" id="search-content">
+        <div class="tab-content col-md-8" id="search-content">
           {% include "groups/_group_list_item.html" %}
         </div>
       </div>

diff --git a/geonode/contrib/groups/templates/groups/group_members.html b/geonode/contrib/groups/templates/groups/group_members.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block sidebar %}
-<div class="twocol">
+<div class="col-md-2">
 
     <ul id="subnav" class="selfclear">
       <li><a href="{% url "group_members" object.slug %}" class="current">{% trans "Members" %}</a></li>

diff --git a/geonode/contrib/groups/templates/groups/group_remove.html b/geonode/contrib/groups/templates/groups/group_remove.html
@@ -6,7 +6,7 @@
 
 {% block body %}
 <div class="row">
-  <div class="span8">
+  <div class="col-md-8">
     <form action="{% url "group_remove" group.slug %}" method="POST">
       <h2>
         {% blocktrans with group.title as group_title %}

diff --git a/geonode/contrib/groups/templates/groups/group_remove_maps_data.html b/geonode/contrib/groups/templates/groups/group_remove_maps_data.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block sidebar %}
-<div class="twocol">
+<div class="col-md-2">
     <h2>{% trans "Remove Maps/Data from Group" %}</h2>
     <form method="POST" action="">
     {% csrf_token %}

diff --git a/geonode/contrib/groups/templates/groups/group_update.html b/geonode/contrib/groups/templates/groups/group_update.html
@@ -6,12 +6,12 @@
 
 {% block body %}
      <div class="block">
-        <div class="span10">
+        <div class="col-md-10">
           <h2 class="page-title">{% trans "Update Group" %}</h2>
           {% if errors %}
             <div id="errors">
               {% for error in errors %}
-                <div style="color:#FF0000;">{{ error }}</div>
+                <div>{{ error }}</div>
               {% endfor %}
             </div>
           {% endif %}

diff --git a/geonode/documents/templates/documents/document_base.html b/geonode/documents/templates/documents/document_base.html
@@ -7,7 +7,7 @@
 {% block body_class %}documents{% endblock %}
 
 {% block body_outer %}
-    <div class="span12">
+    <div class="col-md-12">
       <ul class="nav nav-tabs" id="subnav-tabs">
             <li><a href="{% url "documents_browse" %}" class="explore">{% trans "Explore Documents" %}</a></li>
             <li><a href="{% url "document_upload" %}" class="upload">{% trans "Upload Documents" %}</a></li>

diff --git a/geonode/documents/templates/documents/document_detail.html b/geonode/documents/templates/documents/document_detail.html
@@ -18,12 +18,12 @@
 {% block body_class %}documents{% endblock %}
 
 {% block body_outer %}
-  <div class="span6">
+  <div class="col-md-6">
     <h2 class="page-title">{{ document.title }}</h2>
   </div>
-  <div class="span6 action-group">
-	<div class="btn-group pull-right">
-        <div class="btn-group">
+  <div class="col-md-6 action-group">
+	  <div class="btn-group pull-right">
+      <div class="btn-group">
         <a class="btn btn-large btn-primary dropdown-toggle" data-toggle="dropdown" href="#">
           {% trans "Download Metadata" %}
           <span class="caret"></span>
@@ -33,7 +33,7 @@ <h2 class="page-title">{{ document.title }}</h2>
             <li><a href="{{ link.url }}">{{ link.name }} <i class="icon-chevron-right"></i></a></li>
           {% endfor %}
         </ul>
-     </div>
+      </div>
     {% has_obj_perm user document "documents.change_document" as can_edit_document %}
     {% if can_edit_document %}
     <div class="btn-group">
@@ -51,7 +51,7 @@ <h2 class="page-title">{{ document.title }}</h2>
     {% endif %}
     </div>
   </div>
-  <div class="span8">
+  <div class="col-md-8">
 
       {% if document.extension|lower in imgtypes and document.doc_file %}
       <div id="embedded_map">
@@ -104,7 +104,7 @@ <h3>{% trans 'Average Rating' %}</h3>
         </article>
       </div>
   </div>
-  <aside class="span4">
+  <aside class="col-md-4">
     <div class="well">
         <h2>{% trans "Resource using this document" %}</h2>
         {% if layer.maps %}

diff --git a/geonode/documents/templates/documents/document_list.html b/geonode/documents/templates/documents/document_list.html
@@ -8,7 +8,7 @@
 {% block body_class %}documents documents-list explore{% endblock %}
 
 {% block body %}
-    <div class="span12">
+    <div class="col-md-12">
       <h2 class="page-title">{% trans "Explore Documents" %}</h2>
     </div>
     {% include "search/_search_content.html" %}

diff --git a/geonode/documents/templates/documents/document_remove.html b/geonode/documents/templates/documents/document_remove.html
@@ -5,7 +5,7 @@
 
 {% block body %}
 <div class="row">
-  <div class="span8">
+  <div class="col-md-8">
     <form action="{% url "document_remove" document.id %}" method="POST">
       <h2>
         {% blocktrans with document.title as document_title %}

diff --git a/geonode/documents/templates/documents/document_replace.html b/geonode/documents/templates/documents/document_replace.html
@@ -12,7 +12,7 @@
 
 {% block body %}
     <div class="block">
-        <div class="span8">
+        <div class="col-md-8">
           <h2 class="page-title">{% trans "Replace " %}{{ document.title }}</h2>
             <div id="upload_form">
                 <form method="post" enctype="multipart/form-data" action="{% url "document_replace" document.id %}">

diff --git a/geonode/documents/templates/documents/document_upload.html b/geonode/documents/templates/documents/document_upload.html
@@ -13,7 +13,7 @@
 
 {% block body %}
     <div class="block">
-        <div class="span8">
+        <div class="col-md-8">
           <h2 class="page-title">{% trans "Upload Documents" %}</h2>
             <div>
                 <form id="upload_form"  method="post" enctype="multipart/form-data" action="{% url "document_upload" %}">

diff --git a/geonode/layers/templates/layers/_layer_list_item.html b/geonode/layers/templates/layers/_layer_list_item.html
@@ -21,7 +21,7 @@
       <img class="thumb" src="{{  STATIC_URL }}/geonode/img/missing_thumb.png" />
       {% endif %}
       </a>
-      <h3><i class="icon-unchecked icon-rotate-45"></i> <a href="{% url "layer_detail" layer.typename %}">{{ layer.title }}</a></h3>   
+      <h3><i class="fa fa-square-o"></i> <a href="{% url "layer_detail" layer.typename %}">{{ layer.title }}</a></h3>   
     </div>
     <div class="details">
       <div class="meta">
@@ -45,21 +45,21 @@ <h3><i class="icon-unchecked icon-rotate-45"></i> <a href="{% url "layer_detail"
   <div class="modal custom hide" id="download-{{layer.id}}">
     <div class="modal-header">
       <button class="close" data-dismiss="modal">×</button>
-      <h2><i class="icon-download-alt"></i>  {% trans "Download Layer" %} "{{layer.title}}"</h2>
+      <h2><i class="fa fa-cloud-download"></i>  {% trans "Download Layer" %} "{{layer.title}}"</h2>
     </div>
     <div class="modal-body">
     </div>
     <div class="modal-footer">
       {% if layer.link_set.download|length > 0 %}
         {% for link in layer.link_set.download %}
         {% if forloop.counter0 == 0 %}
-        <div class="span2 offset1">
+        <div class="col-md-2 col-md-offset-1">
           <ul class="unstyled">
             <li><a href="{{ link.url }}">{{ link.name }}</a></li>
         {% elif forloop.counter0 >= forloop.revcounter0 and forloop.revcounter0|add:1 >= forloop.counter0 %}
           </ul>
         </div>
-        <div class="span2">
+        <div class="col-md-2">
           <ul class="unstyled">
             <li><a href="{{ link.url }}">{{ link.name }}</a></li>
         {% else %}
@@ -77,7 +77,7 @@ <h2><i class="icon-download-alt"></i>  {% trans "Download Layer" %} "{{layer.tit
     <div class="content">
         <div class="item-header">
             <img class="thumb" src="{{  STATIC_URL }}/geonode/img/missing_thumb.png" />
-            <h3><i class="icon-unchecked icon-rotate-45"></i> {{ layer.title }}</h3>
+            <h3><i class="fa fa-square-o"></i> {{ layer.title }}</h3>
         </div>
         <div class="details">
             <div class="meta">

diff --git a/geonode/layers/templates/layers/layer_list.html b/geonode/layers/templates/layers/layer_list.html
@@ -6,7 +6,7 @@
 
 {% block title %} {% trans "Explore Layers" %} - {{ block.super }} {% endblock %}
 
-{% block body_class %}data data-list explore{% endblock %}
+{% block body_class %}layers explore{% endblock %}
 
 {% block body %}
   <div class="col-md-12">

diff --git a/geonode/maps/templates/maps/map_list.html b/geonode/maps/templates/maps/map_list.html
@@ -7,11 +7,11 @@
 {% block body_class %}maps explore{% endblock %}
 
 {% block body %}
-    <div class="span12">
-      <a href="{% url "new_map" %}" class="btn btn-large btn-primary pull-right strong">{% trans "Create a New Map" %}</a>
-      <h2 class="page-title">{% trans "Explore Maps" %}</h2>
-    </div>
-    {% include "search/_search_content.html" %}
+  <div class="col-md-12">
+    <a href="{% url "new_map" %}" class="btn btn-primary pull-right">{% trans "Create a New Map" %}</a>
+    <h2 class="page-title">{% trans "Explore Maps" %}</h2>
+  </div>
+  {% include "search/_search_content.html" %}
 {% endblock %}
 
 {% block extra_script %}

diff --git a/geonode/people/templates/people/_profile_list_item.html b/geonode/people/templates/people/_profile_list_item.html
@@ -5,8 +5,8 @@
   <div class="content">
     <div class="item-header">
       <div class="avatar"><a href="{{ profile.profile_detail_url }}" ><img ng-src="{{ profile.avatar_100 }}"/></a></div>
-      <h3><i class="icon-user"></i> <a href="{{ profile.profile_detail_url }}">{{ profile.name }}</a>
-        <a href="mailto:{{ profile.email }}" ng-if="profile.email != ''"><i class="icon-envelope-alt icon-large"></i></a>
+      <h3><i class="fa fa-user"></i> <a href="{{ profile.profile_detail_url }}">{{ profile.name }}</a>
+        <a href="mailto:{{ profile.email }}" ng-if="profile.email != ''"><i class="fa fa-envelope-o"></i></a>
       </h3>
     </div>
     <div class="details">
@@ -18,13 +18,13 @@ <h3><i class="icon-user"></i> <a href="{{ profile.profile_detail_url }}">{{ prof
           {{ profile.profile != '' ?  profile.profile : '' }}
         </p>
           <ul class="nav stats">
-            <li><a href="{{ profile.profile_detail_url }}?content=layers"><strong>{{ profile.layers_count }}</strong>Layers</a></li>
-            <li><a href="{{ profile.profile_detail_url }}?content=maps"><strong>{{ profile.maps_count }}</strong>Maps</a></li>
-            <li><a href="{{ profile.profile_detail_url }}?content=documents"><strong>{{ profile.documents_count }}</strong>Documents</a></li>
+            <li><a href="{{ profile.profile_detail_url }}?content=layers"><strong>{{ profile.layers_count }}</strong> Layers</a></li>
+            <li><a href="{{ profile.profile_detail_url }}?content=maps"><strong>{{ profile.maps_count }}</strong> Maps</a></li>
+            <li><a href="{{ profile.profile_detail_url }}?content=documents"><strong>{{ profile.documents_count }}</strong> Documents</a></li>
           </ul>
       </div> <!-- ./meta -->
 
-      <p><a href="{{ profile.activity_stream_url }}" class="btn btn-mini" type="button">Activities</a></p>
+      <p><a href="{{ profile.activity_stream_url }}" class="btn btn-default btn-xs" type="button">Activities</a></p>
 
     </div> <!-- ./details -->
   </div> <!-- ./content -->