Fix menu positioning in IE7

[snf-cloudcms] / cloudcms / templates / cms / base.html
diff --git a/cloudcms/templates/cms/base.html b/cloudcms/templates/cms/base.html

index 371ac82..d5d5046 100644 (file)
--- a/cloudcms/templates/cms/base.html
+++ b/cloudcms/templates/cms/base.html
@@ -18,31 +18,37 @@
    <meta name="description" content="{{ resource.meta.description }}">
    <meta name="author" content="{{ resource.meta.author }}">
    <meta name="viewport" content="">
+
+  <link rel="alternate" type="application/atom+xml" href="{% url blogfeed %}">
+
      
    {% block page.js %}
    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
    <!--[if lt IE 9]>
-    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+      <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
    <![endif]-->
    {% endblock %}
    
    {% block favicons %}
-  <link rel="shortcut icon" href="">
-  <link rel="apple-touch-icon" href="">
+  <link rel="shortcut icon" href="{{ APP.favicon.get_absolute_url }}">
+  <link rel="apple-touch-icon" href="{{ APP.favicon.get_absolute_url }}">
    {% endblock favicons %}
  
    {% block css %}
-      <link href='http://fonts.googleapis.com/css?family=Antic' rel='stylesheet' type='text/css'>
+      <link href='https://fonts.googleapis.com/css?family=Antic' rel='stylesheet' type='text/css'>
        <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}cloudcms/css/styles.css">
+      <!--[if lte IE 7]>
+          <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}cloudcms/css/ie7.css">
+      <![endif]-->
    {% endblock css %}
  
    {% block headjs %}
        <script src="{{ MEDIA_URL }}cloudcms/js/modernizr-2.0.6.js"></script>
        <script src="{{ MEDIA_URL }}cloudcms/js/jquery-1.7.1.min.js"></script>
+      <script src="{{ MEDIA_URL }}cloudcms/js/underscore.js"></script>
        <script src="{{ MEDIA_URL }}cloudcms/js/jquery.infieldlabel.js"></script>
        <script src="{{ MEDIA_URL }}cloudcms/js/jquery.cookie.js"></script>
        <script src="{{ MEDIA_URL }}cloudcms/js/form-errors.js"></script>
-
        <script src="{{ MEDIA_URL }}cloudcms/js/colorbox/jquery.colorbox.js"></script>
    {% endblock headjs %}
  
@@ -50,37 +56,38 @@
    {{ feincms_page.content.media }}
    {% endblock %}
  
-
    {% block page.scripts.cloudbar %}
-  {% if CLOUDBAR_BASE_URL %}
-  <script>
-        var CLOUDBAR_ACTIVE_SERVICE = '{{ CLOUDBAR_ACTIVE_SERVICE }}';
-        var CLOUDBAR_LOCATION = "{{ CLOUDBAR_BASE_URL }}";
-
-        $(document).ready(function(){
-            $.getScript(CLOUDBAR_LOCATION + 'cloudbar.js');
-        });
-  </script>
-  {% endif %}
+      {% if CLOUDBAR_ACTIVE %} {{ CLOUDBAR_CODE }} {% endif %}
    {% endblock %}
  
     <script type="text/javascript">
        $(document).ready(function() {
            $("form.innerlabels label").inFieldLabels();
-          $("form input").attr('autocomplete', 'off');
            $("form .form-row").formErrors();
        })
     </script>
    {% block endhead %}{% endblock endhead %}
  
+  <style type="text/css">
+  {% block extrastyles %}
+  {% endblock %}
+  </style>
+
+  {% if APP.extra_styles %}
+  <style type="text/css">
+      {{ APP.extra_styles|safe }}
+  </style>
+  {% endif %}
+    
  </head>
  
  <body class='cms-page-{{ feincms_page.slug }}'>
+    {% block page.mainbody %}
      <div class='container'>
          <div class='header'>
              <div class="mainlogo">
                      {% if APP.logo %}
-                        <a href="/" title="{{ APP.title }}">
+                        <a href="{{ APP.index_url }}" title="{{ APP.title }}">
                              <img src="{{ APP.logo.get_absolute_url }}" alt="{{ APP.title }}" />
                          </a>
                      {% else %}
@@ -110,13 +117,23 @@
                  </ul>
              </div>
          </div>
+        {% if messages %}
+        <ul class="messages">
+            {% for message in messages %}
+            <li{% if message.tags %}
+                class="{{ message.tags }}"{% endif %}>
+                {{ message }}</li>
+            {% endfor %}
+        </ul>
+        {% endif %}
          <div class="page">
                  {% block page.body %}
                  {% endblock %}
          </div>
      </div>
      <div class="footer">
-        footer
+        {% include "cms/footer.html" %}
      </div>
+    {% endblock page.mainbody %}
  </body>
  </html>