fix(markup): rename main to feincmsmain ID so it doesn't collide with django3.1 admin panel markup

koriaf · koriaf · commit a65425c63dc6 · 2021-03-16T18:44:11.000+01:00
diff --git a/feincms/static/feincms/item_editor.css b/feincms/static/feincms/item_editor.css
@@ -16,7 +16,7 @@
     border-color: #79aec8;
 }
 
-#main {
+#feincmsmain {
     clear:both;
     padding: 10px 10px 10px 10px;
     border: 1px solid #eee;
@@ -90,7 +90,7 @@ select {
     max-width: 580px;
 }
 
-#main_wrapper {
+#feincmsmain_wrapper {
     margin: 10px 0 30px 0;
 }
 
@@ -245,7 +245,7 @@ div.order-machine div.inline-related > h3{
 /* django suit hacks */
 /*********************/
 
-#suit-center #main {
+#suit-center #feincmsmain {
     clear:none;
 }
 
diff --git a/feincms/static/feincms/item_editor.js b/feincms/static/feincms/item_editor.js
@@ -52,7 +52,7 @@ if (!Array.prototype.indexOf) {
 
     SELECTS = {};
     function save_content_type_selects() {
-        $('#main>.panel').each(function() {
+        $('#feincmsmain>.panel').each(function() {
             SELECTS[this.id.replace(/_body$/, '')] = $("select[name=order-machine-add-select]", this).clone().removeAttr("name");
         });
     }
@@ -259,7 +259,7 @@ if (!Array.prototype.indexOf) {
     }
 
     function init_content_type_buttons() {
-        $('#main > .panel').each(function() {
+        $('#feincmsmain > .panel').each(function() {
             var $select = $('select[name=order-machine-add-select]', this),
                 to_remove = [];
 
@@ -358,7 +358,7 @@ if (!Array.prototype.indexOf) {
     $(document).ready(function($){
         hide_form_rows_with_hidden_widgets();
 
-        create_tabbed('#main_wrapper', '#main', function(tab_str){
+        create_tabbed('#feincmsmain_wrapper', '#feincmsmain', function(tab_str){
             ACTIVE_REGION = REGION_MAP.indexOf(tab_str);
             // make it possible to open current tab on page reload
             window.location.replace('#tab_'+tab_str);
@@ -564,7 +564,7 @@ if (!Array.prototype.indexOf) {
         });
 
 
-        var errors = $('#main div.errors');
+        var errors = $('#feincmsmain div.errors');
 
         if(errors.length) {
             var id = errors.parents('fieldset[id$=_body], div[id$=_body]').attr('id');
@@ -579,7 +579,7 @@ if (!Array.prototype.indexOf) {
                 }
             }
 
-            $('#main_wrapper>div.navi_tab:first-child').trigger('click');
+            $('#feincmsmain_wrapper>div.navi_tab:first-child').trigger('click');
         }
     });
 
diff --git a/feincms/templates/admin/feincms/content_editor.html b/feincms/templates/admin/feincms/content_editor.html
@@ -1,10 +1,10 @@
 {% load i18n %}
 {% load feincms_admin_tags %}
-<div id="main_wrapper">
+<div id="feincmsmain_wrapper">
     {% for region in original.template.regions %}
         <div class="navi_tab" id="{{ region.key }}_tab">{{ region.title }}</div>
     {% endfor %}
-    <div id="main">
+    <div id="feincmsmain">
         {% for region in original.template.regions %}
         <div id="{{ region.key }}_body" class="panel">
             <div class="empty-machine-msg">
diff --git a/feincms/templates/admin/feincms/item_editor.html b/feincms/templates/admin/feincms/item_editor.html
@@ -51,7 +51,7 @@
   </div>
   <script type="text/javascript">
     feincms.jQuery(function($){
-      $("h2:contains('{{ FEINCMS_CONTENT_FIELDSET_NAME }}')").parent().replaceWith($("#main_wrapper"));
+      $("h2:contains('{{ FEINCMS_CONTENT_FIELDSET_NAME }}')").parent().replaceWith($("#feincmsmain_wrapper"));
     });
   </script>
 {% endblock %}

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`border-color: #79aec8;`
`17`	`17`	`}`
`18`	`18`
`19`		`-#main {`
	`19`	`+#feincmsmain {`
`20`	`20`	`clear:both;`
`21`	`21`	`padding: 10px 10px 10px 10px;`
`22`	`22`	`border: 1px solid #eee;`
`@@ -90,7 +90,7 @@ select {`
`90`	`90`	`max-width: 580px;`
`91`	`91`	`}`
`92`	`92`
`93`		`-#main_wrapper {`
	`93`	`+#feincmsmain_wrapper {`
`94`	`94`	`margin: 10px 0 30px 0;`
`95`	`95`	`}`
`96`	`96`
`@@ -245,7 +245,7 @@ div.order-machine div.inline-related > h3{`
`245`	`245`	`/* django suit hacks */`
`246`	`246`	`/*********************/`
`247`	`247`
`248`		`-#suit-center #main {`
	`248`	`+#suit-center #feincmsmain {`
`249`	`249`	`clear:none;`
`250`	`250`	`}`
`251`	`251`