Commits

Anonymous committed eba0737

Some contrast to admin color scheme. Some bugs in page reordering.
Site design almost done.

Comments (0)

Files changed (8)

eagproject/eag-static/css/style.css

 }
 
 body {
-    background-color: #cfcfda;
+    background-color: #b4b9c2;
 }
 
 #Everything {
 #Actions {
     height: 16pt;
     list-style-type: none;
-    border-top: 1px solid #ccc;
-    border-bottom: 1px solid #ccc;
-    background-color: #f5f2ff;
+    border-top: 1px solid #aeaeae;
+    border-bottom: 1px solid #aeaeae;
+    background-color: #eaedfe;
     margin: 0.5em 0;
 }
 
 #Actions li {
     float: left;
-    border-right: 1px solid #ccc;
+    border-right: 1px solid #aeaeae;
     padding: 0 1.5em;
     height: 16pt;
     line-height: 16pt;
 }
 
 #Actions li a {
-    color: #6b6b70;
+    color: #434447;
 }
 
 #Actions li a:hover {
 #Tree li {
     border-radius: 0.4em;
     -moz-border-radius: 0.4em;
-    background-color: #f0f0f0;
+    background-color: #e5e5e5;
     margin: 0.4em 0;
-    border: 1px solid #ccc;
+    border: 1px solid #aeaeae;
     padding: 0 0.6em;
     line-height: 22pt;
     font-size: 14pt;
 }
 
 #Root .info span.delete {
-    color: #f0f0f0;
+    color: #e5e5e5;
 }
 
 #Tree.ordering {
 }
 
 #Tree.ordering li {
-    background-color: #e2e2ec;
-    background-color: #dadada;
-    border: 1px solid #888;
+    background-color: #c3c3c3;
+    border: 1px solid #5d5d5d;
     cursor: move;
 }
 
     margin-left: 3em;
     padding: 0.3em 0.5em;
     font-weight: bold;
-    border-top: 1px solid #ccc;
-    border-bottom: 1px solid #ccc;
-    background-color: #f5f2ff;
+    border-top: 1px solid #aeaeae;
+    border-bottom: 1px solid #aeaeae;
+    background-color: #eaedfe;
 }
 
 #SaveOrder {
 }
 
 fieldset {
-    border: 1px solid #ccc;
+    border: 1px solid #aeaeae;
     margin: 1.0em 0;
-    background-color: #f5f2ff;
+    background-color: #e5e5e5;
     padding: 0.5em 4.0em 1.5em 2.0em;
 }
 
     font-weight: bold;
     font-size: 12pt;
     padding: 0.2em 1em;
-    border: 1px solid #ccc;
+    border: 1px solid #aeaeae;
     background-color: #f0f0f0;
 }
 

eagproject/eag-static/js/site-tree.js

         var to = getLevel(prev);
         var cx = clone.getPosition().x;
 
-        if (from >= to) {
+        if (from > to) {
             setLevel(elem, from);
             return;
+        } else if (from == to) {
+            if (cx > fx)
+                setLevel(elem, from + 1);
+            else
+                setLevel(elem, from);
+            return;
         }
 
         var stepLength = (tx - fx) / parseFloat(to - from);

eagproject/eagadmin/models/pages.py

             'current': self,
             'breadcrumb': get_breadcrumb(self)
         }
-        tname = 'gsite/types/%s.html' % self.class_name().lower()
+        tname = 'eagsite/types/%s.html' % self.class_name().lower()
         try:
             return render_to_response(tname, data,
                     context_instance=RequestContext(request))

eagproject/eagadmin/templatetags/eagsite.py

     def render(self, context):
         current = template.Variable('current').resolve(context)
         return '<title>%s</title>' \
-            '<meta name="keywords" content="%s"></meta>' \
-            '<meta name="description" content="%s" ></meta>' \
+            '<meta name="keywords" content="%s">' \
+            '<meta name="description" content="%s" >' \
             % (current.title, current.keywords or '', current.description or '')
 
 def head(parser, token):

eagproject/static/css/style.css

 .clr { clear: both; }
 
 h1, h2, h3, h4, h5, h6 { font-family: Arial, serif; color: #000; font-weight: normal; }
-h1 { font-size: 18pt; font-weight: normal; margin-bottom: 20pt; }
+h1 { font-size: 18pt; font-weight: normal; margin-bottom: 10pt; }
 #SiteName { font-family: Georgia, serif; font-size: 32pt; }
 
 #Wrapper { padding: 40px 100px 0 100px; }
 
 
 #Content { border: 3px solid #444; background: #fff; padding: 60px 40px 120px 40px; }
-#Footer {}
+#Footer { padding: 7px 104px 40px 104px; color: #ccc; font-size: 8pt; }
 
 #Menu { float: right; font-family: Georgia, serif; font-size: 14pt; line-height: 10pt; margin-bottom: 50pt; }
 #Menu a { color: #aeaeae; text-decoration: none; }

eagproject/templates/eagsite/base.html

 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   {% load eagsite %}{% eagsite_head %}
-  <link rel="stylesheet" href="{{ MEDIA_URL }}static/css/style.css" type="text/css" media="screen" charset="utf-8"></link>
+  <link rel="stylesheet" href="{{ MEDIA_URL }}static/css/style.css" type="text/css" media="screen" charset="utf-8">
 </head>
 <body class="{{ current.class_name }}">
   {% eagsite_get_page "" as root %}
         <li class="home {% ifequal current root %}current{% endifequal %}"><a href="{{ root.get_absolute_url }}">Home</a>
         {% eagsite_list_menu "main-menu" %}
       </ul>
-      <h1 id="SiteName">Site Name</h1>
+      <h1 id="SiteName">&lt;Site Name&gt;</h1>
       <div class="clr"></div>
       {% block content %}{% endblock %}
     </div>
   </div>
-  <div id="Footer"></div>
+  <div id="Footer">
+    Copyright (c) &lt;Year&gt; &lt;Name Surname|Company's Name&gt;
+  </div>
 </body>
 </html>

eagproject/templates/eagsite/page.html

 {% extends "eagsite/base.html" %}
 {% block content %}
-<h1>Documentation</h1>
-<div class="text">
-  <p>
-    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus aliquet
-    adipiscing tincidunt. Nullam dolor justo, placerat a ultrices quis, mattis
-    vitae dolor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque
-    sapien neque, fringilla vitae feugiat ut, condimentum eu mi. Etiam ante urna,
-    suscipit cursus aliquam eu, feugiat quis risus. Sed sagittis volutpat dui,
-    quis fringilla mauris tristique eget. Aliquam erat volutpat. Cras eget neque
-    lorem. Nunc in aliquet leo. Morbi sit amet lacus id arcu ultrices bibendum.
-    Duis ut venenatis nulla. Praesent eget felis libero, et interdum enim. Donec
-    varius felis a magna volutpat ac sodales sapien gravida. Sed vel augue dolor.
-  </p>
-  <p>
-    Vestibulum non ornare massa. Etiam sit amet mi quis diam condimentum dictum
-    vitae vel libero. Integer auctor venenatis lorem, nec fringilla eros ornare
-    malesuada. Fusce ac nisl est, faucibus fringilla tellus. Sed vitae sem non
-    orci congue luctus. Duis sodales metus nec nunc porta et adipiscing risus
-    porta. Integer ligula eros, ornare id sollicitudin nec, venenatis vel purus.
-    Nulla quis arcu risus, nec fermentum diam. In gravida nunc non metus pharetra
-    mattis. Pellentesque faucibus tristique rutrum. Mauris nunc ipsum, ultrices
-    vel semper et, scelerisque non lacus. Sed scelerisque pulvinar vehicula. Fusce
-    quis magna quis quam dictum pellentesque id in nulla. Ut vel dolor sapien, non
-    ultricies sem. Nulla facilisi. Maecenas nisl velit, lobortis eu semper et,
-    rutrum eget leo. Nulla lectus lectus, tincidunt vitae viverra eget, dictum sed
-    est. Proin vitae leo dui. Suspendisse sollicitudin bibendum arcu, at congue
-    eros ultrices eget.
-  </p>
-  <p>
-    In tempus erat sed eros scelerisque eu sollicitudin eros ullamcorper. Fusce
-    posuere metus nec libero porttitor fermentum. Donec bibendum consequat nisl.
-    Donec id urna nibh, id euismod diam. Mauris varius ultrices mauris, ac tempor
-    metus rutrum sit amet. Morbi id enim quis est hendrerit scelerisque.
-    Vestibulum viverra blandit sapien ac facilisis. Cras eget neque nisl, id
-    interdum metus. Quisque sit amet nisl a nisl volutpat viverra sit amet ut
-    sapien. Praesent velit est, ullamcorper quis semper ut, porttitor vitae eros.
-    Suspendisse potenti. Proin nec lectus nulla. Ut sem ligula, rhoncus tincidunt
-    venenatis ut, vulputate ut ante. Pellentesque nec est non tellus condimentum
-    consequat. Nam et sapien ut lorem posuere pharetra. Nam non metus sed diam
-    tempus laoreet in nec justo. Cras eu scelerisque lacus. Praesent ac augue in
-    ipsum dictum rhoncus sed vel diam. Pellentesque est velit, sagittis in
-    adipiscing at, mollis sit amet erat.
-  </p>
-</div>
+<h1>{{ current.title }}</h1>
+{% block custom %}{% endblock %}
 {% endblock %}

eagproject/templates/eagsite/types/text.html

+{% extends "eagsite/page.html" %}
+{% block custom %}
+<div class="text">{{ current.content|safe }}</div>
+{% endblock %}