newrelic config

assets/css/main.css

@@ -2382,9 +2382,9 @@ input[type="checkbox"]:checked + span {
     position: relative;
 }
 
-.infoProjectBlock .existing-file-widget {
+/*.infoProjectBlock .existing-file-widget {*/
-    margin-left: 50px;
+    /*margin-left: 50px;*/
-}
+/*}*/
 
 .infoProjectBlock .existing-file-widget a {
     color: #737373;

projects/admin.py

@@ -21,6 +21,12 @@ from .models import (
 
 class BuildingClassficationAdmin(MPTTModelAdmin):
     readonly_fields = ('pk', 'lft', 'rght', 'tree_id', 'level')
+    list_display = ('pk', 'name', 'order', 'parent')
+
+
+class ConstructionTypeAdmin(admin.ModelAdmin):
+    # readonly_fields = ('pk', 'lft', 'rght', 'tree_id', 'level')
+    list_display = ('pk', 'name', 'order')
 
 
 class ProjectAdminForm(forms.ModelForm):
@@ -51,7 +57,7 @@ admin.site.register(Answer)
 admin.site.register(Arbitration)
 admin.site.register(BuildingClassfication, BuildingClassficationAdmin)
 admin.site.register(Candidate)
-admin.site.register(ConstructionType)
+admin.site.register(ConstructionType, ConstructionTypeAdmin)
 admin.site.register(Order, OrderAdmin)
 admin.site.register(Portfolio)
 admin.site.register(PortfolioPhoto)

projects/templates/project_detail.html

@@ -117,21 +117,28 @@
             {{ project.text|linebreaksbr }}
           </p>
         </div>
-        br
+        <br>
-
+        {% if project.files.all|length %}
-        <div class="col-lg-10 col-lg-offset-1" style="margin-top: 15px;">
+          <div class="col-lg-10 col-lg-offset-1" style="margin-top: 15px;margin-left:150px;margin-bottom: 15px;">
+
+              Приложенные файлы ( {{ project.files.all|length }} ):
+              <ul>
+              {% for file in project.files.all %}
+                <li class="existing-file-widget">
+                  {% if request.user.is_authenticated %}
+                    <a href="{{ file }}" class="file-upload-label">
+                  {% endif %}
 
-          <p class="textProIn">
+                      {{ file.file.name|basename }} {{ file.file.size|filesizeformat }}
-            Приложенные файлы:
 
-            {% for file in project.files.all %}
+                  {% if request.user.is_authenticated %}
-              <li class="existing-file-widget">
+                    </a>
-                <a href="{{ file }}"
+                  {% endif %}
-                   class="file-upload-label">{{ file.file.name|basename }} {{ file.file.size|filesizeformat }}</a>
+                </li>
-              </li>
+              {% endfor %}
-            {% endfor %}
+              </ul>
-          </p>
+          </div>
-        </div>
+        {% endif %}
 
         <div class="col-lg-10 col-lg-offset-1">
           {% if request.user.is_contractor and not answer %}

ssl/nic.ru/intermediate_pem_thawte_ssl123_1.crt

@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE-----
+MIIE0jCCA7qgAwIBAgIQLGnhL2pnC9md0g+RnvCeUTANBgkqhkiG9w0BAQsFADCB
+qTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
+Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
+MDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNV
+BAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMTQwNjEwMDAwMDAwWhcNMjQw
+NjA5MjM1OTU5WjBjMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3RlLCBJbmMu
+MR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEeMBwGA1UEAxMVdGhhd3Rl
+IERWIFNTTCBDQSAtIEcyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+6pQHhchBLPaDEmySX6sfANSWb3TNLhHpbA85AblIkEA5TcSiyHlqpZq9kURld1St
+/yVf7kL7swIP6l163RpUntdzQpvMeV/FTfS3Cxg5IHrdUAFdNEVfTBEO9YcmJrSw
+835xoDFxUIloWmOKFGLljDoWVQ0+66qAHXF644cHq72idM3aCAGdG8wniIxH1Gkl
+Qta7UG2FUNBIgg0In+kj40LGPJi4u27FcBPfGR0B/dK1TuZi9Af6a30Rd8RiT0BO
+pXiXqyxNDKd8w8RQMp/QcJsP//91WTSFrUnVNe5PW9TUNpWgfujFoRy9E0597mNq
+lhmZyKcqAOZRjUbrMFjoLQIDAQABo4IBOTCCATUwEgYDVR0TAQH/BAgwBgEB/wIB
+ADBBBgNVHSAEOjA4MDYGCmCGSAGG+EUBBzYwKDAmBggrBgEFBQcCARYaaHR0cHM6
+Ly93d3cudGhhd3RlLmNvbS9jcHMwDgYDVR0PAQH/BAQDAgEGMC4GCCsGAQUFBwEB
+BCIwIDAeBggrBgEFBQcwAYYSaHR0cDovL3Quc3ltY2QuY29tMDEGA1UdHwQqMCgw
+JqAkoCKGIGh0dHA6Ly90LnN5bWNiLmNvbS9UaGF3dGVQQ0EuY3JsMCkGA1UdEQQi
+MCCkHjAcMRowGAYDVQQDExFTeW1hbnRlY1BLSS0xLTY5ODAdBgNVHQ4EFgQUn7jB
+qWzy9cAiKpTtXJms1OzXxgcwHwYDVR0jBBgwFoAUe1tFz6/Oy3r9MZIaarbzRutX
+SFAwDQYJKoZIhvcNAQELBQADggEBAFNU8keoAtfvqjV4vkoIDZAYS22eKlMr6VQX
+d3QpftA3BwW45Pq4tGOYRNzGT4EGjDq+xzBXxnD81pMZn8NV1z4fcoqdMFo1lzLL
+Y+TGct/7aMppL9vNUDg+K7urO4LH/UubvXxBmO8BU9g1jyXJAwbmnFfBUQ+e9n2T
+Tfh2yDpr9MSPMzJ/nSGENNmn+ZL6QZFhhAWdo3lGzmfngfJerEy8qKtqbRXinE5a
+2WOAvPdC65pExoxrBja0izKJ3sLxqCaqqaz/6nGm54xB+hc1u7OHMamTwshY4QpO
+lYOcue07pe8I4HT5wxvmB6PuB9dCInkhoKHUHSbT0NamXStBwHk=
+-----END CERTIFICATE-----

ssl/nic.ru/proekton_com_2017_10_18.crt

@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFjjCCBHagAwIBAgIQCqciRB6FljImlwWcV0fLYTANBgkqhkiG9w0BAQsFADBj
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3RlLCBJbmMuMR0wGwYDVQQLExRE
+b21haW4gVmFsaWRhdGVkIFNTTDEeMBwGA1UEAxMVdGhhd3RlIERWIFNTTCBDQSAt
+IEcyMB4XDTE2MTAxNzAwMDAwMFoXDTE3MTAxNzIzNTk1OVowFzEVMBMGA1UEAwwM
+cHJvZWt0b24uY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA238E
+5cBm1jMl1fkQycKHldWwUxjq0xIRKo21ma4l/TBW3EzErh56vJ9PWFhJH7VH77Lj
+IRfxtyA+a7Zja+DJdvkKfWpMubK0SNzi8C3E+wW7J/G9rOCmFWM7SrVaEFX+jltr
+axH396UgBlT8jkg035OCsGzQ/OefbLRTriDG9OQFG+vTSNv7XqUKM0hE8ilBoPnV
+wGuJdUinedV3cPSPU5AKZwnDRjjQ6o5eFj9evEl+3woB1/jFdY2ia4dywUQAU8op
++VXIXnbC2V1UtoZD5BVTq3QTmol7vwmiV5OiwAdzHuBdhjg0tIdJYWV++ux2pegx
+nKeC2lETR0g94b4xzwIDAQABo4ICiDCCAoQwKQYDVR0RBCIwIIIMcHJvZWt0b24u
+Y29tghB3d3cucHJvZWt0b24uY29tMAkGA1UdEwQCMAAwKwYDVR0fBCQwIjAgoB6g
+HIYaaHR0cDovL3RuLnN5bWNiLmNvbS90bi5jcmwwbgYDVR0gBGcwZTBjBgZngQwB
+AgEwWTAmBggrBgEFBQcCARYaaHR0cHM6Ly93d3cudGhhd3RlLmNvbS9jcHMwLwYI
+KwYBBQUHAgIwIwwhaHR0cHM6Ly93d3cudGhhd3RlLmNvbS9yZXBvc2l0b3J5MB8G
+A1UdIwQYMBaAFJ+4wals8vXAIiqU7VyZrNTs18YHMA4GA1UdDwEB/wQEAwIFoDAd
+BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwVwYIKwYBBQUHAQEESzBJMB8G
+CCsGAQUFBzABhhNodHRwOi8vdG4uc3ltY2QuY29tMCYGCCsGAQUFBzAChhpodHRw
+Oi8vdG4uc3ltY2IuY29tL3RuLmNydDCCAQQGCisGAQQB1nkCBAIEgfUEgfIA8AB1
+AN3rHSt6DU+mIIuBrYFocH4ujp0B1VyIjT0RxM227L7MAAABV9LcAU0AAAQDAEYw
+RAIgFd7a+xUZEjUGM+SpPqmXOEukP2Jb3rdV5yISRmbLMW4CIDMaUjjNJCVf64I5
+PAD4ucUK1janHsflLZ+jQtKr0IXaAHcAaPaY+B9kgr46jO65KB1M/HFRXWeT1ETR
+Cmesu09P+8QAAAFX0twBdgAABAMASDBGAiEAyQ5A3wICl8YnLpyTgXjLVPAeHpKF
+fBd+inhL2CZp1egCIQDV9fLkNfVpMTFbNKVZXu8gyfG3dpJQrbCzE3FBd9JJqzAN
+BgkqhkiG9w0BAQsFAAOCAQEAcafiWP81zgV8XQNFI4yfl2LK6om+VpxeOJzrmlXO
+9un96OoP0S4gPav/x75+tq9PBslVFXuB3usEL3io9gX/hBWtrp9Z1ItAnYJ+XTup
+8YbRP+GharJduJyLOYtwJrJDGiYFV4dRct/OqgYGzOpAbX8ty8TA8suY7ovLnlgQ
+pLnZ8qpvlQbZxKay2ThwUcP7pWLoCb2Sgrf4N05Ua7pFSklw0gE2qeur2lEl8aYv
+qd02mqEJY17gRe7Jl2OF+2V47PEiZ23zAzTxgvwODt77OkwbeoQf8MB3E7LwOX6k
+kVCYqpzc6geWsU2l7EqpngUSV/AD3gupmRdWOkCMW0LqKg==
+-----END CERTIFICATE-----

ssl/nic.ru/root_pem_thawte_ssl123_1.crt

@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCB
+qTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
+Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
+MDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNV
+BAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3MDAwMDAwWhcNMzYw
+NzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5j
+LjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYG
+A1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsoPD7gFnUnMekz52hWXMJEEUMDSxuaPFs
+W0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ1CRfBsDMRJSUjQJib+ta
+3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGcq/gcfomk
+6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6
+Sk/KaAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94J
+NqR32HuHUETVPm4pafs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XP
+r87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUFAAOCAQEAeRHAS7ORtvzw6WfU
+DW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeEuzLlQRHAd9mz
+YJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2
+/qxAeeWsEG89jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/
+LHbTY5xZ3Y+m4Q6gLkH3LpVHz7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7
+jVaMaA==
+-----END CERTIFICATE-----

yvnu26bm.htm

@@ -0,0 +1 @@
+e3zWZQbN7tVPtRzgjqnq