revert hs_app_template to state prior to RHESSys work (should have be…

…en forked, not commit to)

admin.py

@@ -3,6 +3,3 @@
 from .models import *
 
 # admin.site.register(MyResource, PageAdmin)
-
-
-admin.site.register(InstResource, PageAdmin)

models.py

@@ -3,59 +3,11 @@
 from django.db import models
 from mezzanine.pages.models import Page, RichText
 from mezzanine.core.models import Ownable
-from hs_core.models import AbstractResource, resource_processor
-from .forms import InputForm
-from mezzanine.pages.page_processors import processor_for
+from hs_core.models import AbstractResource
+
 #
 # To create a new resource, use these three super-classes. 
 #
 
-class InstResource(Page, RichText, AbstractResource):
-    class Meta:
-        verbose_name = 'REHESsys Instance Resource'
-    name = models.CharField(max_length=50)
-    git_repo = models.URLField()
-    git_username = models.CharField(max_length=50)
-    # later change it to use Jeff's password encode function with django SECRET_KEY
-    git_password = models.CharField(max_length=50)
-    commit_id = models.CharField(max_length=50)
-    model_desc = models.CharField(max_length=500)
-    git_branch = models.CharField(max_length=50)
-    study_area_bbox = models.CharField(max_length = 50)
-    model_command_line_parameters = models.CharField(max_length=50)
-
-    def can_add(self, request):
-        return AbstractResource.can_add(self, request)
-
-    def can_change(self, request):
-        return AbstractResource.can_change(self, request)
-
-    def can_delete(self, request):
-        return AbstractResource.can_delete(self, request)
-
-    def can_view(self, request):
-        return AbstractResource.can_view(self, request)
-
-
-processor_for(InstResource)(resource_processor)
-
-@processor_for(InstResource)
-def main_page(request, page):
-    if(request.method == 'POST'):
-        form = InputForm(request.POST)
-        if(form.is_valid()):
-            content_model = page.get_content_model()
-            content_model.name=form.cleaned_data['name']
-            content_model.model_desc = form.cleaned_data['model_desc']
-            content_model.study_area_bbox = form.cleaned_data['study_area_bbox']
-            content_model.git_repo = form.cleaned_data['git_repo']
-            content_model.git_username = form.cleaned_data['git_username']
-            content_model.git_password = form.cleaned_data['git_password']
-            content_model.commit_id = form.cleaned_data['commit_id']
-            content_model.git_branch = form.cleaned_data['git_branch']
-            content_model.model_command_line_parameters = form.cleaned_data['model_command_line_parameters']
-            content_model.save()
-    else:
-        form = InputForm()
+# class MyResource(Page, RichText, AbstractResource)
 
-    return  {'form': form}

templates/pages/genericresource.html

@@ -0,0 +1,83 @@
+{% extends "pages/page.html" %}
+{% load geoanalytics_tags pages_tags mezzanine_tags %}
+
+{% block main %}
+    {% set_page_permissions page %}
+
+<div class='row'>
+    {% editable page.genericresource.content %}
+       {{ page.genericresource.content|safe|richtext_filters }}
+    {% endeditable %}
+</div>
+
+<h4>Download files</h4>
+<div class='row'>
+{% if page.genericresource.resource_file %}
+    <a class='btn btn-lg btn-primary' href='{{page.genericresource.resource_file.url}}'>{{ page.genericresource.resource_file.name }}</a>
+{% elif page.genericresource.resource_url %}
+    <a class='btn btn-lg btn-primary' href='{{page.genericresource.resource_url}}'>Resource URL links to off-site</a>
+{% endif %}
+</div>
+
+<hr/>
+<div class='row'>
+    <ul class='list-group'>
+        {% editable page.genericresource.discoverable %}
+        <li class='list-group-item'><b>Creator:</b> {{ page.genericresource.creator }}</li>
+        {% endeditable %}
+        <li class='list-group-item'><b>Created on</b> {{ page.created|date:"SHORT_DATETIME_FORMAT" }}</li>
+        <li class='list-group-item'><b>Last modified by:</b> {{ page.genericresource.last_changed_by.username }}</li>
+        <li class='list-group-item'><b>Modified on</b> {{ page.updated|date:"SHORT_DATETIME_FORMAT" }}</li>
+        {% editable page.genericresource.public %}
+        <li class='list-group-item'><b>Publicly viewable:</b> {{ page.genericresource.public|yesno }}</li>
+        {% endeditable %}
+        {% editable page.genericresource.frozen %}
+        <li class='list-group-item'><b>Published:</b> {{ page.genericresource.published_and_frozen|yesno }}</li>
+        {% endeditable %}
+        {% editable page.genericresource.do_not_distribute %}
+        <li class='list-group-item'><b>Do Not Distribute:</b> {{ page.genericresource.do_not_distribute|yesno }}</li>
+        {% endeditable %}
+        {% editable page.genericresource.discoverable %}
+        <li class='list-group-item'><b>Discoverable:</b> {{ page.genericresource.discoverable|yesno }}</li>
+        {% endeditable %}
+    </ul> 
+    <h5>Owners</h5>
+    <div class='list-group'>
+        {% editable page.genericresource.owners %} 
+        {% for owner in page.genericresource.owners.all %}
+        <a class='list-group-item' href='mailto:{{ page.genericresource.owner.email }}'>
+             {% if owner.first_name %}
+                {{ owner.first_name }} {{ page.genericresource.owner.last_name }}
+             {% else %}
+                {{ owner.username }}
+             {% endif %}
+	</a>
+        {% endfor %}
+        {% endeditable %}
+    </div>
+</div>
+
+<h4>Dublin Core Metadata</h4>
+<table class="table table-striped">
+{% for m in page.genericresource.dublin_metadata.all %}
+<tr> 
+<td>{{m.term_name}}</td>
+<td>{{m.qualifier}}</td>
+<td>{{m.content}}</td>
+</tr>
+{% endfor %}
+</table>
+
+<h4>Keywords</h4>
+
+<ul class='list-group'>
+    {% editable page.keywords %} 
+    {% for keyword in page.keywords.all %}
+    <li class='list-group-item'>{{ keyword }}</li>
+    {% endfor %}
+    {% endeditable %}
+</ul>
+
+    {% include 'pages/includes/page_permissions_editor.html' %}
+
+{% endblock %}

urls.py

@@ -1,7 +0,0 @@
-#from django.conf.urls import patterns, url
-#from hs_inst_res_ui.views import *
-
-#urlpatterns = patterns('',
-#    # resource API
-#    url(r'^hs_inst_res_ui/$', main_page),
-#)