Permalink
Browse files

Merge branch 'master' of https://github.com/FinalAngel/django-cms int…

…o FinalAngel-master
  • Loading branch information...
2 parents 4a37654 + f5d2d46 commit e046e3ac88451542bb24693e3fa916ac03a0817d Jonas Obrist committed Jan 18, 2011
Showing with 85 additions and 60 deletions.
  1. BIN cms/media/cms/images/pony.jpg
  2. +66 −47 cms/templates/cms/new.html
  3. +19 −13 cms/templates/cms/toolbar/toolbar.html
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -1,50 +1,69 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en"><head>
- <meta http-equiv="content-type" content="text/html; charset=utf-8">
- <meta name="robots" content="NONE,NOARCHIVE"><title>Welcome to Django</title>
- <style type="text/css">
- html * { padding:0; margin:0; }
- body * { padding:10px 20px; }
- body * * { padding:0; }
- body { font:small sans-serif; }
- body>div { border-bottom:1px solid #ddd; }
- h1 { font-weight:normal; }
- h2 { margin-bottom:.8em; }
- h2 span { font-size:80%; color:#666; font-weight:normal; }
- h3 { margin:1em 0 .5em 0; }
- h4 { margin:0 0 .5em 0; font-weight: normal; }
- table { border:1px solid #ccc; border-collapse: collapse; width:100%; background:white; }
- tbody td, tbody th { vertical-align:top; padding:2px 3px; }
- thead th { padding:1px 6px 1px 3px; background:#fefefe; text-align:left; font-weight:normal; font-size:11px; border:1px solid #ddd; }
- tbody th { width:12em; text-align:right; color:#666; padding-right:.5em; }
- ul { margin-left: 2em; margin-top: 1em; }
- #summary { background: #e0ebff; }
- #summary h2 { font-weight: normal; color: #666; }
- #explanation { background:#eee; }
- #instructions { background:#f6f6f6; }
- #summary table { border:none; background:transparent; }
- </style>
-</head>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="en" xml:lang="en">
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <meta http-equiv="x-ua-compatible" content="ie=edge,chrome=1" />
+ <title>Welcome to django CMS</title>
+ <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;" />
+ <style type="text/css">
+ /*<![CDATA[*/
+ html,body,div,span,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,form,fieldset,legend,label,input,textarea,table,caption,tbody,tfoot,thead,tr,th,td,cite,pre,strong,em,img,a,p,blockquote,q,code,dfn,samp,kbd,var,del,ins,sub,sup,acronym,abbr,address,applet,object,iframe { font-size:100%; font-style:normal; font-weight:normal; text-align:left; vertical-align:baseline; margin:0; padding:0; border:none; background:transparent; }
+ html { font-size:100.01%; -webkit-text-size-adjust:none; }
+ body { color:#999; font:75%/1.6 "Helvetica Neue",Helvetica,Arial,sans-serif; margin:0; }
-<body>
-<div id="summary">
- <h1>Welcome to django-cms</h1>
-</div>
+ .clear { clear:both; display:block; width:0; height:0; overflow:hidden; visibility:hidden; }
+
+ #main { width:940px; margin:0 auto; padding-top:5%; }
+ #main .box-left { float:left; width:55%; }
+ #main .box-right { float:left; width:41%; padding:50px 2% 0; min-height:300px; }
+ #main .box-right p { text-align:right; }
+ #main .foot { text-align:right; padding-right:2%; }
+ #main .padding-top { padding-top:20px; }
+ #main .info { padding-top:5px; }
-<div id="instructions">
- <p>Here's what to do next:</p>
- <ul>
- <li>Log into the <a href="{% url admin:index %}">admin</a> interface and start <a href="{% url pages-root %}admin/cms/page/add/">adding</a> some pages!</li>
- <li>Make sure you publish them.</li>
- <li>If you don't see the django-cms logo here make sure that you linked the <code>cms/media</code> folder to your media files: <img src="{{ CMS_MEDIA_URL }}images/logo.jpg" alt="here should be a logo"/></li>
- <li>More information can be found in the <a href="http://django-cms.rtfd.org/">documentation</a> or on <a href="http://www.django-cms.org/">django-cms.org</a></li>
- </ul>
-</div>
+ a { color:#5b80b2; font-weight:bold; text-decoration:none; }
+ a:hover { text-decoration:underline; }
+ h1, h2 { font-size:25px; font-weight:bold; line-height:1.2; text-align:right; }
+ h1 { color:#666; }
+ code { color:#000; }
-<div id="explanation">
- <p>
- You're seeing this message because you have <code>DEBUG = True</code> in your
- Django settings file and you haven't added any pages yet. Get to work!
- </p>
-</div>
-</body></html>
+ .link, .link-inverted { float:right; overflow:auto; }
+ .link, .link-inverted,
+ .link:hover, .link-inverted:hover { font-size:17px; padding:10px 20px; margin:0 0 0 10px; text-decoration:none; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; }
+ .link { color:#5b80b2; border:1px solid #eee; background:#f9f9f9;
+ background:-webkit-gradient(linear, 0 0, 0 bottom, from(#ffffff), to(#fafafa)); background:-moz-linear-gradient(#ffffff, #fafafa); background:linear-gradient(#ffffff, #fafafa); }
+ .link:hover,
+ .link-inverted { color:#fff; border:1px solid #5b80b2; background:#5b80b2;
+ background:-webkit-gradient(linear, 0 0, 0 bottom, from(#7b99c1), to(#557299)); background:-moz-linear-gradient(#7b99c1, #557299); background:linear-gradient(#7b99c1, #557299); }
+ .link-inverted:hover { background:#365176; border:1px solid #365176;
+ background:-webkit-gradient(linear, 0 0, 0 bottom, from(#5b80b2), to(#365176)); background:-moz-linear-gradient(#5b80b2, #365176); background:linear-gradient(#5b80b2, #365176); }
+ /*]]>*/
+ </style>
+</head>
+<body>
+ <div id="main">
+ <div class="box-left">
+ <p><img src="{{ CMS_MEDIA_URL }}images/pony.jpg" alt="" />&nbsp;</p>
+ </div>
+ <div class="box-right">
+ <h1>Welcome django CMS!<br />Here is what to do next:</h1>
+ <p>&nbsp;</p>
+ <h2>Log into the <a href="/admin/">admin</a> interface and start <a href="/admin/cms/page/add/">adding</a> some pages!</h2>
+ <p class="info">Make sure you publish them.</p>
+ <p>&nbsp;</p>
+ <p class="padding-top">
+ <a href="http://www.django-cms.org/" class="link-inverted">Django-CMS.org</a>
+ <a href="http://docs.django-cms.org/" class="link">Documentation</a>
+ </p>
+ </div>
+ <div class="clear"></div>
+ <p class="foot padding-top">
+ If you don't see the django CMS logo at the end of this line make sure you linked the <code>cms/media</code> folder
+ to your media files: <img src="{{ CMS_MEDIA_URL }}images/logo.jpg" alt="here should be a logo" height="20" /></p>
+ <p class="foot">
+ You're seeing this message because you have <code>DEBUG = True</code> in your
+ django settings file and haven't added any pages yet. Get to work!"
+ </p>
+ </div>
+</body>
+</html>
@@ -1,26 +1,30 @@
{% load i18n %}
-<style type="text/css">
- @import "{{ CMS_MEDIA_URL }}css/toolbar.css";
- @import "{{ CMS_MEDIA_URL }}css/jquery.dialog.css";
-</style>
-<script type="text/javascript" charset="utf-8">
+<script type="text/javascript" src="{{ MEDIA_URL }}admin/js/jquery.min.js"></script>
+<script type="text/javascript">
//<![CDATA[
// When jQuery is sourced, it's going to overwrite whatever might be in the
// '$' variable, so store a reference of it in a temporary variable...
var _$ = window.$;
- if (typeof jQuery == 'undefined') {
- var jquery_url = 'http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js';
- document.write(unescape('%3Cscript src="' + jquery_url + '" type="text/javascript"%3E%3C/script%3E'));
- }
- //]]>
+ // add stylesheets to head
+ (function ($) {
+ $('<link>').appendTo('head').attr({
+ rel: 'stylesheet', type: 'text/css',
+ href: '{{ CMS_MEDIA_URL }}css/toolbar.css'
+ });
+ $('<link>').appendTo('head').attr({
+ rel: 'stylesheet', type: 'text/css',
+ href: '{{ CMS_MEDIA_URL }}css/jquery.dialog.css'
+ });
+ })(jQuery);
+ //]]>
</script>
<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/lib/jquery.cookie.js"></script>
<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/lib/jquery.backgroundposition.js"></script>
<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/tools.js"></script>
<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/lib/jquery.nyroModal-1.6.2.pack.js"></script>
<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/lib/ui.core.js"></script>
<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/lib/ui.dialog.js"></script>
-<script type="text/javascript" charset="utf-8">
+<script type="text/javascript">
//<![CDATA[
// dynamic variables for the toolbar js file
var placeholder_data = {{ placeholder_data }};
@@ -205,13 +209,15 @@
<!--li><a href="#"><span class="cms_toolbar_icon_pageunpublish">Icon</span>Unpublish Page</a></li-->
<li><a href="{% url admin:cms_page_history page.pk %}"><span class="cms_toolbar_icon_history">{% trans "history" %}</span>{% trans "View History" %}</a></li>
{% endif %}
- {% endif %}
+ {% endif %}
</ul>
</div>
{% if auth %}
<form method="post" action="" id="cms_toolbar_logoutform" {% if auth_error %}class="cms_toolbar_error"{% endif %}>{% csrf_token %}
+ <fieldset>
<input type="submit" name="logout_submit" value="{% trans "Logout" %}" class="cms_submit" />
<a href="#" class="cms_toolbar_button" id="cms_toolbar_logoutbutton" ><span><strong>{% trans "Lock" %}</strong><em>{% trans "Logout" %}</em></span></a>
+ </fieldset>
</form>
{% endif %}
<a href="#" id="cms_toolbar_closebutton" class="cms_toolbar_button cms_toolbar_iconbutton"><span><strong>{% trans "Close" %}</strong></span></a>
@@ -240,7 +246,7 @@
<div id="dialog" title="Approve dialog">
<p>This page must be moderated at level 0, post a message for moderator.</p>
<div class="row"><input type="text" name="df_moderator_message" id="id_df_moderator_message" class="wide" value=""/></div>
- <div class="row"><input type="checkbox" name="df_moderator_state" id="id_df_moderator_state" value="1"/><label for="id_df_moderator_reguest">Request approval</label></div>
+ <div class="row"><input type="checkbox" name="df_moderator_state" id="id_df_moderator_state" value="1"/><label for="id_df_moderator_state">Request approval</label></div>
</div>
</div>

0 comments on commit e046e3a

Please sign in to comment.