Merge branch 'master' of https://github.com/GeoNode/geonode

GeoNode · Jul 26, 2016 · f943c9a · f943c9a
2 parents 22f2fa5 + c4f1249
commit f943c9a
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 34 deletions.
diff --git a/docs/tutorials/install_and_admin/geonode_install/all_together.txt b/docs/tutorials/install_and_admin/geonode_install/all_together.txt
@@ -151,15 +151,6 @@ The resulting configuration file should look like this:::
     # Default preview library
     #LAYER_PREVIEW_LIBRARY = 'geoext'
 
-Create GeoNode Superuser
-========================
-
-Now create the admin user for GeoNode running the following:::
-
-    python manage.py createsuperuser
-
-You will be prompted for the username, email address and passoword for the user
-
 Initialize the Database
 =======================
 
@@ -182,6 +173,15 @@ and::
 
     psql -U geonode geonode_data
 
+Create GeoNode Superuser
+========================
+
+Now create the admin user for GeoNode running the following:::
+
+    python manage.py createsuperuser
+
+You will be prompted for the username, email address and passoword for the user
+
 Test the installation
 =====================
 

diff --git a/docs/tutorials/install_and_admin/geonode_install/install_geonode_application.txt b/docs/tutorials/install_and_admin/geonode_install/install_geonode_application.txt
@@ -90,14 +90,14 @@ GeoNode Setup
 
 Let's download GeoNode from the main GeoNode repository on GitHub:
 
-.. 
+..
     For the purpose of this training the GeoNode repository has
     been downloaded and placed in the `geonode` user `home folder` (/home/geo/geonode).
     *Skip* the following command group.
 
 ::
 
-    git clone https://github.com/GeoNode/geonode.git
+    git clone https://github.com/GeoNode/geonode.git --branch 2.4.x
     sudo useradd -m geonode
     sudo mv ~/geonode /home/geonode/
 

diff --git a/docs/tutorials/install_and_admin/geonode_install/setup_configure_httpd.txt b/docs/tutorials/install_and_admin/geonode_install/setup_configure_httpd.txt
@@ -97,14 +97,13 @@ Now load apache `proxy` module::
 
     sudo a2enmod proxy_http
 
-And enable geonode configuration file::
+Disable default configuration::
 
-    sudo a2ensite geonode
+    sudo a2dissite 000-default
 
-Dowload GeoNode data to be served by Apache. You will be prompted for confirmation::
+And enable geonode configuration file::
 
-    cd /home/geonode/geonode/
-    sudo -u geonode python manage.py collectstatic
+    sudo a2ensite geonode
 
 Add `thumbs` and `layers` folders::
 
@@ -121,6 +120,11 @@ them:::
     chmod -Rf 777 /home/geonode/geonode/geonode/uploaded/layers
     sudo chown www-data:www-data /home/geonode/geonode/geonode/static_root/
 
+Copy GeoNode data to be served by Apache. You will be prompted for confirmation::
+
+    cd /home/geonode/geonode/
+    sudo -u geonode python manage.py collectstatic
+
 SSL configuration
 -----------------
 

diff --git a/geonode/documents/templates/documents/document_detail.html b/geonode/documents/templates/documents/document_detail.html
@@ -44,7 +44,7 @@ <h2>{{ resource.title }}</h2>
       <p><a href="{{ resource.doc_url }}" target="_blank">Download the {{ resource }} document.</a> <small>({% trans 'External Resource' %})</small></p>
       {%  endif %}
     {%  endif %}
-       
+
     <div class="documents-actions">
       {% include "_actions.html" %}
     </div>
@@ -55,11 +55,11 @@ <h2>{{ resource.title }}</h2>
       {% block social_links %}
         {% include "social_links.html" %}
       {% endblock %}
-        
+
       <article id="comments" class="tab-pane">
       {% include "_comments.html" %}
       </article>
-        
+
       <article id="rate" class="tab-pane">
         <!-- TODO: Move this to a reusable template snippet -->
         {% if request.user.is_authenticated %}
@@ -88,7 +88,7 @@ <h4>{% trans 'Average Rating' %}</h4>
         <a href="{% url "document_metadata_detail" resource.id %}">
             <button class="btn btn-primary btn-md btn-block">{% trans "Metadata Detail" %}</button>
         </a>
-    </li> 
+    </li>
 
     <ul class="list-group">
       <li class="list-group-item">
@@ -164,13 +164,13 @@ <h5 class="modal-title" id="myModalLabel">
 					Full metadata
 					</h5>
 					<ul style="list-style: outside none none;padding: 0;">
-						<li><a href="https://{{request.META.HTTP_HOST}}/catalogue/csw_to_extra_format/{{resource.uuid}}/{{resource.title}}.txt"> Text format </a></li>
-						<li><a target="_blank" href="https://{{request.META.HTTP_HOST}}/catalogue/csw_to_extra_format/{{resource.uuid}}/{{resource.title}}.html"> HTML format </a></li>
+						<li><a target="_blank" href="../catalogue/csw_to_extra_format/{{resource.uuid}}/{{resource.title}}.txt"> Text format </a></li>
+						<li><a target="_blank" href="../catalogue/csw_to_extra_format/{{resource.uuid}}/{{resource.title}}.html"> HTML format </a></li>
 					</ul>
-				</div>		  
+				</div>
 			  <h5 class="modal-title" id="myModalLabel">
 			  Standard Metadata - XML format
-			  </h5>	
+			  </h5>
               <ul style="list-style: outside none none;padding: 0;">
                 {% for link in metadata %}
                 <li><a href="{{ link.url }}">{{ link.name }}</a></li>

diff --git a/geonode/layers/templates/layers/layer_detail.html b/geonode/layers/templates/layers/layer_detail.html
@@ -126,7 +126,7 @@ <h2 class="page-title">{{ resource.title|default:resource.typename }}</h2>
         {% paginate %}
       </article>
      {% endif %}
-    
+
       <article id="attributes" class="tab-pane">
         {% if resource.is_mosaic %}
             <table class="table table-striped table-bordered table-condensed">
@@ -275,10 +275,10 @@ <h4 class="modal-title" id="myModalLabel">{% trans "Download Layer" %}</h4>
       {% get_obj_perms request.user for resource.layer as "layer_perms" %}
     {% endif %}
 
-    <li class="list-group-item"> 
+    <li class="list-group-item">
       <a href="{% url "layer_metadata_detail" resource.typename %}">
-        <button class="btn btn-primary btn-md btn-block">{% trans "Metadata Detail" %}</button> 
-      </a>    
+        <button class="btn btn-primary btn-md btn-block">{% trans "Metadata Detail" %}</button>
+      </a>
     </li>
 
     {% if "change_resourcebase_metadata" in perms_list or "change_resourcebase" in perms_list or "delete_resourcebase" in perms_list or "change_layer_style" in layer_perms %}
@@ -359,12 +359,12 @@ <h4 class="modal-title" id="myModalLabel">{% trans "Download Metadata" %}</h4>
           <div class="modal-body">
 		    <div style="margin-bottom:20px">
 				 <h5 class="modal-title" id="myModalLabel">
-				Full metadata 
+				Full metadata
 				 </h5>
-				<ul>
-					<li><a href="http://{{request.META.HTTP_HOST}}/catalogue/csw_to_extra_format/{{resource.uuid}}/{{resource.title}}.txt"> Text format </a></li>
-					<li><a target="_blank" href="http://{{request.META.HTTP_HOST}}/catalogue/csw_to_extra_format/{{resource.uuid}}/{{resource.title}}.html"> HTML format </a></li>
-				</ul>
+                 <ul>
+ 					<li><a target="_blank" href="../catalogue/csw_to_extra_format/{{resource.uuid}}/{{resource.title}}.txt"> Text format </a></li>
+ 					<li><a target="_blank" href="../catalogue/csw_to_extra_format/{{resource.uuid}}/{{resource.title}}.html"> HTML format </a></li>
+ 				</ul>
 			</div>
 			<h5 class="modal-title" id="myModalLabel">
 			Standard Metadata - XML format
@@ -399,7 +399,7 @@ <h4>{% trans "Maps using this layer" %}</h4>
         <p>{% trans "List of maps using this layer:" %}</p>
         {% endif %}
         <ul class="list-unstyled">
-          {% for maplayer in resource.maps %} 
+          {% for maplayer in resource.maps %}
             <li><a href="{{ maplayer.map.get_absolute_url }}">{{ maplayer.map.title }}</a></li>
           {% empty %}
             <li>{% trans "This layer is not currently used in any maps." %}</li>