root il y a 3 ans
Parent
commit
16fc5ffd3c
3 fichiers modifiés avec 13 ajouts et 7 suppressions
  1. 7 4
      designer/designer_gen.py
  2. 5 2
      designer/gen_conf.py
  3. 1 1
      faq/faq_insert.py

+ 7 - 4
designer/designer_gen.py

@@ -42,6 +42,7 @@ def proc_file(fname,fname2,compcontent):
             fw.write(compcontent)
             fw.write('</div>\n')
             fw.write('<div  class="row mt-5" id="row_intro">\n')
+            continue
 
         if 'link rel' in l and '/assets/css/all.css?v=' in l and 'stylesheet' in l:
             fw.write('<link rel="stylesheet" href="/assets/css/all.css?v=1640073543">')
@@ -87,10 +88,11 @@ def proc_file(fname,fname2,compcontent):
             fw.write("var acompany =  document.getElementById('a_company'); \n")
 
             fw.write("var id_offs =  document.getElementById('id_offs'); \n")
-            fw.write(' id_offs.style.display="block";  \n')
-
-            fw.write(' rintro.style.display="block";  \n')
             fw.write(' rcomp.style.display = "none";  \n')
+            fw.write(' id_offs.style.display="flex";  \n')
+
+            fw.write(' rintro.style.display="flex";  \n')
+#            fw.write(' rcomp.style.display = "none";  \n')
             fw.write(' aintro.className = "nav-link active";  \n')
             fw.write(' acompany.className = "nav-link";  \n')
 
@@ -103,8 +105,9 @@ def proc_file(fname,fname2,compcontent):
             fw.write("var acompany =  document.getElementById('a_company'); \n")
             fw.write("var id_offs =  document.getElementById('id_offs'); \n")
             fw.write(' id_offs.style.display="none";  \n')
-            fw.write(' rcomp.style.display = "block";  \n')
             fw.write(' rintro.style.display="none";  \n')
+            fw.write(' rcomp.style.display = "flex";  \n')
+            #fw.write(' rintro.style.display="none";  \n')
             
             fw.write(' acompany.className = "nav-link active";  \n')
             fw.write(' aintro.className = "nav-link";  \n')

+ 5 - 2
designer/gen_conf.py

@@ -5,7 +5,7 @@ import dataset
 
 
 def proc_file(content):
-    fw=codecs.open('/etc/nginx/six/six.conf','w','utf-8')
+    fw=codecs.open('/etc/nginx/six/six_ext.conf','w','utf-8')
     fw.write(content)
     fw.close()
 
@@ -17,8 +17,11 @@ for c in cursor:
     did=c['hdesigner_id']
     print(did)
 #    content+=" location ^~ /six/"+str(did)+"/ { \n"
-    content+=" location ^~ /designers/cases/"+str(did)+"/1-page/new-sort/  { \n"
 
+
+   # content+=" location ^~ /designers/cases/"+str(did)+"/1-page/new-sort/  { \n"
+    content+=" location ^~ /d2/"+str(did)+"/  { \n"
+    content+=" add_header Access-Control-Allow-Origin *; \n"
     content+=" alias /var/www/jared-six/"+str(did)+"/; }\n"
 
 proc_file(content)

+ 1 - 1
faq/faq_insert.py

@@ -3,7 +3,7 @@ import os
 import codecs
 
 #lst=['5926','5878','5912','5939','5885','4300']
-lst=['5926']
+lst=['4300']
 
 dir_prefix='/var/www/jared-faq/'