updates on field rendering, add updates to nav admin

tendenci · Mar 10, 2015 · 2ffde6c · 2ffde6c
1 parent 487a65c
commit 2ffde6c
Show file tree

Hide file tree

Showing 7 changed files with 124 additions and 77 deletions.
diff --git a/tendenci/apps/events/templates/admin/events/customregform/change_form.html b/tendenci/apps/events/templates/admin/events/customregform/change_form.html
@@ -14,6 +14,6 @@
 
 {% block field_sets %}
     {% for fieldset in adminform %}
-      {% include "events/admin/fieldset.html" %}
+      {% include "dab_override/fieldset.html" %}
     {% endfor %}
 {% endblock %}
diff --git a/tendenci/apps/events/templates/admin/includes/fieldset.html b/tendenci/apps/events/templates/admin/includes/fieldset.html
diff --git a/tendenci/apps/memberships/templates/admin/memberships/membershiptype/change_form.html b/tendenci/apps/memberships/templates/admin/memberships/membershiptype/change_form.html
@@ -10,4 +10,10 @@
     });
 </script>
 {% endif %}
+{% endblock %}
+
+{% block field_sets %}
+    {% for fieldset in adminform %}
+      {% include "dab_override/fieldset.html" %}
+    {% endfor %}
 {% endblock %}
diff --git a/tendenci/apps/memberships/templates/admin/memberships/notice/change_form.html b/tendenci/apps/memberships/templates/admin/memberships/notice/change_form.html
@@ -1,14 +1,13 @@
-{% extends "admin/change_form.html" %}
-{% load i18n %}
+{% extends "django_admin_bootstrapped:admin/change_form.html" %}
+{% load i18n admin_urls admin_static admin_modify bootstrapped_goodies_tags %}
+{% load perm_tags %}
 
-{% block object-tools %}
-{% if change %}{% if not is_popup %}
-  <ul class="object-tools">
-    {% block object-tools-items %}
-    <li><a href="history/" class="historylink">{% trans "History" %}</a></li>
+
+{% block object-tools-items %}
+    <li>
+        {% url opts|admin_urlname:'history' original.pk|admin_urlquote as history_url %}
+        <a role="button" href="{% add_preserved_filters history_url %}" class="historylink">{% trans "History" %}</a>
+    </li>
     <li><a href="{% url 'admin:membership_notice.admin_clone' original.pk %}">{% trans "Clone this notice" %}</a></li>
-    {% if has_absolute_url %}<li><a href="../../../r/{{ content_type_id }}/{{ object_id }}/" class="viewsitelink">{% trans "View on site" %}</a></li>{% endif%}
-    {% endblock %}
-  </ul>
-{% endif %}{% endif %}
-{% endblock %}
+    {% if has_absolute_url %}<li><a href="{% url 'admin:view_on_site' content_type_id original.pk %}" class="viewsitelink">{% trans "View on site" %}</a></li>{% endif%}
+{% endblock %}
diff --git a/tendenci/apps/navs/templates/admin/navs/edit_inline/tabular.html b/tendenci/apps/navs/templates/admin/navs/edit_inline/tabular.html
@@ -1,16 +1,16 @@
-{% load i18n admin_static admin_modify %}{% load cycle from future %}
-<div class="inline-group" id="{{ inline_admin_formset.formset.prefix }}-group">
+{% load i18n admin_static admin_modify bootstrapped_goodies_tags %}
+<div class="_inline-group" id="{{ inline_admin_formset.formset.prefix }}-group">
   <div class="tabular inline-related {% if forloop.last %}last-related{% endif %}">
 {{ inline_admin_formset.formset.management_form }}
 <fieldset class="module">
    <h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>
    {{ inline_admin_formset.formset.non_form_errors }}
-   <table>
+   <table class="table table-striped table-bordered">
      <thead><tr>
      {% for field in inline_admin_formset.fields %}
        {% if not field.widget.is_hidden %}
          <th{% if forloop.first %} colspan="2"{% endif %}{% if field.required %} class="required"{% endif %}>{{ field.label|capfirst }}
-         {% if field.help_text %}&nbsp;<img src="{% static "admin/img/icon-unknown.gif" %}" class="help help-tooltip" width="10" height="10" alt="({{ field.help_text|striptags }})" title="{{ field.help_text|striptags }}" />{% endif %}
+         {% if field.help_text %}<i class="glyphicon glyphicon-comment help help-tooltip" style="margin-left: 4px;" alt="({{ field.help_text|striptags }})" title="{{ field.help_text|striptags }}"></i>{% endif %}
          </th>
        {% endif %}
      {% endfor %}
@@ -25,11 +25,14 @@ <h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>
         <tr class="form-row {% cycle "row1" "row2" %} {% if inline_admin_form.original or inline_admin_form.show_url %}has_original{% endif %}{% if forloop.last %} empty-form{% endif %}"
              id="{{ inline_admin_formset.formset.prefix }}-{% if not forloop.last %}{{ forloop.counter0 }}{% else %}empty{% endif %}">
         <td class="original">
+          {% if inline_admin_formset.opts.sortable_field_name %}
+          <span class="btn btn-default btn-xs drag-handler pull-left"><i class="glyphicon glyphicon-move"></i></span>
+          {% endif %}
           {% if inline_admin_form.original or inline_admin_form.show_url %}<p>
           {% if inline_admin_form.original %} {{ inline_admin_form.original }}{% endif %}
-          {% if inline_admin_form.show_url %}<a href="{% url 'admin:view_on_site' inline_admin_form.original_content_type_id inline_admin_form.original.pk %}">{% trans "View on site" %}</a>{% endif %}
+          {% if inline_admin_form.show_url %}<a href="../../../r/{{ inline_admin_form.original_content_type_id }}/{{ inline_admin_form.original.id }}/">{% trans "View on site" %}</a>{% endif %}
             </p>{% endif %}
-          {% if inline_admin_form.needs_explicit_pk_field %}{{ inline_admin_form.pk_field.field }}{% endif %}
+          {% if inline_admin_form.has_auto_field or inline_admin_form.needs_explicit_pk_field %}{{ inline_admin_form.pk_field.field }}{% endif %}
           {{ inline_admin_form.fk_field.field }}
           {% spaceless %}
           {% for fieldset in inline_admin_form %}
@@ -46,10 +49,12 @@ <h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>
             {% for field in line %}
               <td{% if field.field.name %} class="field-{{ field.field.name }}"{% endif %}>
               {% if field.is_readonly %}
-                  <p>{{ field.contents|linebreaksbr }}</p>
+                  <p>{{ field.contents }}</p>
               {% else %}
-                  {{ field.field.errors.as_ul }}
-                  {{ field.field }}
+                  {% if field.errors %}
+                  <div class="alert alert-danger">{{ field.errors|striptags }}</div>
+                  {% endif %}
+                  {% dab_field_rendering field.field %}
               {% endif %}
               </td>
             {% endfor %}
@@ -66,6 +71,96 @@ <h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>
   </div>
 </div>
 
+<script type="text/javascript">
+(function($) {
+    $(document).ready(function($) {
+        var rows = "#{{ inline_admin_formset.formset.prefix }}-group .tabular.inline-related tbody tr";
+        var alternatingRows = function(row) {
+            $(rows).not(".add-row").removeClass("row1 row2")
+                .filter(":even").addClass("row1").end()
+                .filter(rows + ":odd").addClass("row2");
+        }
+        var reinitDateTimeShortCuts = function() {
+            // Reinitialize the calendar and clock widgets by force
+            if (typeof DateTimeShortcuts != "undefined") {
+                $(".datetimeshortcuts").remove();
+                DateTimeShortcuts.init();
+            }
+        }
+        var updateSelectFilter = function() {
+            // If any SelectFilter widgets are a part of the new form,
+            // instantiate a new SelectFilter instance for it.
+            if (typeof SelectFilter != "undefined"){
+                $(".selectfilter").each(function(index, value){
+                  var namearr = value.name.split('-');
+                  SelectFilter.init(value.id, namearr[namearr.length-1], false, "{% static "admin/" %}");
+                });
+                $(".selectfilterstacked").each(function(index, value){
+                  var namearr = value.name.split('-');
+                  SelectFilter.init(value.id, namearr[namearr.length-1], true, "{% static "admin/" %}");
+                });
+            }
+        }
+        var initPrepopulatedFields = function(row) {
+            row.find('.prepopulated_field').each(function() {
+                var field = $(this);
+                var input = field.find('input, select, textarea');
+                var dependency_list = input.data('dependency_list') || [];
+                var dependencies = [];
+                $.each(dependency_list, function(i, field_name) {
+                  dependencies.push('#' + row.find('.field-' + field_name).find('input, select, textarea').attr('id'));
+                });
+                if (dependencies.length) {
+                    input.prepopulate(dependencies, input.attr('maxlength'));
+                }
+            });
+        }
+        $(rows).formset({
+            prefix: "{{ inline_admin_formset.formset.prefix }}",
+            addText: "{% blocktrans with verbose_name=inline_admin_formset.opts.verbose_name|title %}Add another {{ verbose_name }}{% endblocktrans %}",
+            formCssClass: "dynamic-{{ inline_admin_formset.formset.prefix }}",
+            deleteCssClass: "inline-deletelink",
+            deleteText: "{% trans "Remove" %}",
+            emptyCssClass: "empty-form",
+            removed: alternatingRows,
+            added: (function(row) {
+                initPrepopulatedFields(row);
+                reinitDateTimeShortCuts();
+                updateSelectFilter();
+                alternatingRows(row);
+            })
+        });
+    });
+})(django.jQuery);
+
+
+
+// listener for jquery 1.7.2
+(function($) {
+    {% if inline_admin_formset.opts.sortable_field_name %}
+    $('tbody').sortable({
+        // items: '.dynamic-{{ inline_admin_formset.formset.prefix }}',
+        handle: '.drag-handler',
+        items: ".form-row"
+    });
+    $("#{{ opts.model_name }}_form").submit(function(e) {
+        var sortable_field_name = "{{ inline_admin_formset.opts.sortable_field_name }}",
+            i = 0;
+        var initial_form_count = $('#id_{{ inline_admin_formset.formset.prefix }}-INITIAL_FORMS').val();
+
+        $('#{{ inline_admin_formset.formset.prefix }}-group table > tbody').find(".form-row").each(function(i, e) {
+            // make sure we don't assign a position unless extra has been moved
+            if ($(this).find("input[name$='" + sortable_field_name + "']").val() || (i <= initial_form_count - 1 )) {
+                $(this).find("input[name$='" + sortable_field_name + "']").val(i);
+                i++;
+            }
+        });
+    });
+    {% endif %}
+
+})(jQuery);
+</script>
+
 <script type="text/javascript">
 
 (function($) {
@@ -111,4 +206,4 @@ <h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>
     get_nav_item_attrs();
   });
 })(django.jQuery);
-</script>
+</script>
diff --git a/tendenci/settings.py b/tendenci/settings.py
@@ -540,7 +540,7 @@
 # ----------------------------------- #
 # Django Admin Bootstrap
 # ------------------------------------#
-# DAB_FIELD_RENDERER = 'django_admin_bootstrapped.renderers.BootstrapFieldRenderer'
+DAB_FIELD_RENDERER = 'django_admin_bootstrapped.renderers.BootstrapFieldRenderer'
 
 from django.contrib import messages
 

diff --git a/...ents/templates/events/admin/fieldset.html → ...enci/templates/dab_override/fieldset.html b/...ents/templates/events/admin/fieldset.html → ...enci/templates/dab_override/fieldset.html