Merge branch 'feature/replace_frontendadmin' of http://github.com/ser…

…vee/servee into feature/replace_frontendadmin
pygeek · Mar 15, 2011 · 14c1c22 · 14c1c22
2 parents 194bd11 + 5467fce
commit 14c1c22
Show file tree

Hide file tree

Showing 9 changed files with 210 additions and 188 deletions.
diff --git a/servee/frontendadmin/templates/servee/base.html b/servee/frontendadmin/templates/servee/base.html
@@ -4,6 +4,7 @@
 <title>{% block title %}{% endblock %}</title>
 <link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% load adminmedia %}{% admin_media_prefix %}css/base.css{% endblock %}" />
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/djAdmin.css" />
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/admin.css" />
 {% block extrastyle %}{% endblock %}
 <!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="{% block stylesheet_ie %}{% load adminmedia %}{% admin_media_prefix %}css/ie.css{% endblock %}" /><![endif]-->
 {% if LANGUAGE_BIDI %}<link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% admin_media_prefix %}css/rtl.css{% endblock %}" />{% endif %}

diff --git a/servee/static/css/admin.css b/servee/static/css/admin.css
@@ -1,4 +1,4 @@
-@import url(admin-reset.css);
 @import url(inline-form-styles.css);
 @import url(overlay.css);
-@import url(overlay-typography.css);
+@import url(overlay-typography.css);
+@import url(animate.css);
diff --git a/servee/static/css/animate.css b/servee/static/css/animate.css
@@ -0,0 +1,27 @@
+.srv_adminBox, .srv_adminBox div, .srv_adminBox ul{
+-webkit-transition: all 0.15s ease;
+-moz-transition: all 0.15s ease;
+-o-transition: all 0.15s ease;
+transition: all 0.15s ease;
+}
+
+/* -- open everything ---*/
+#srv_wysiwyg_tools.out, 
+#srv_CSSstyles.out, #srv_CSSstyles.out ul, 
+#srv_insertMedia.out, #srv_insertMedia.out .srv_mediaList, #srv_insertMedia.out .srv_mediaList, #srv_insertMedia.out .srv_filePane
+{
+left:0px;
+}
+
+
+
+
+
+/* -- shuffle the tinyMCE toolbar around ---*/
+
+#srv_wysiwyg_tools.out.srv_CSSstyles{
+left:150px;
+}
+#srv_wysiwyg_tools.out.srv_insertMedia{
+left:340px;
+}
diff --git a/servee/static/css/djAdmin.css b/servee/static/css/djAdmin.css
@@ -148,30 +148,9 @@ color:#000;
 }
 
 /* ------------ new insert media dialog ------- */
-#srv_insertMedia{
-top:0px;
-bottom:0px;
-left:0px;
-left:-550px;
-width:500px;
-position: fixed;
-}
-#srv_insertMedia img{
-border:0 none;
-outline:0 none;
-}
 
-div.srv_adminBox .srv_filePane {
-overflow:auto;
-top:16px;
-bottom:16px;
-left:216px;
-left:-500px;
-width:150px;
-position:fixed;
-height:auto;
-margin:0;
-}
+
+
 
 div.srv_adminBox .srv_filePane li, ul.srv_gallery_filepane li{
 margin:0 0 8px 0;
@@ -227,18 +206,7 @@ border-radius:0px;
 width:168px;
 text-align: left;
 }
-ul.srv_mediaList, ul.srv_galleryList{
-top:16px;
-left:368px;
-left:-500px;
-width:136px;
-position:fixed;
-list-style:none;
-margin:0;
-padding:0;
-overflow:auto;
-bottom:16px;
-}
+
 
 ul.srv_mediaList li, ul.srv_mediaList li p, ul.srv_mediaList li a, ul.srv_mediaList li a:hover,
 ul.srv_galleryList li, ul.srv_galleryList li p, ul.srv_galleryList li a, ul.srv_galleryList li a:hover

diff --git a/servee/static/css/inline-form-styles.css b/servee/static/css/inline-form-styles.css
diff --git a/servee/static/css/overlay-typography.css b/servee/static/css/overlay-typography.css
@@ -0,0 +1,11 @@
+#srv_adminLarge a, ul#srv_adminList a{
+border-bottom:0 none;
+}
+
+div.srv_adminBox h4{
+color: #333;
+font: lighter 20px/26px Helvetica Neue,Helvetica,Arial sans-serif;
+border-bottom:1px solid #ccc;
+padding: 6px 0;
+margin:0;
+}
diff --git a/servee/static/css/overlay.css b/servee/static/css/overlay.css
@@ -1,4 +1,9 @@
 /*-----overall admin toolbar skin ----*/
+#srv_wrap{
+position: fixed;
+width:30px;
+left:0;
+}
 .srv_adminBox{
 background:#c3c3c3;
 border-right:1px solid #909090;
@@ -28,26 +33,28 @@ border:0 none;
 /* ------------ new CSS Styles dialog ------- */
 #srv_CSSstyles{
 left:0;
-left:-350px;
+left:-150px;
 top:0;
 bottom:0;
-width:250px;
+width:150px;
 position: fixed;
 }
 #srv_CSSstyles ul{
 top:0px;
 bottom:0;
-left:-250px;
+left:-150px;
 margin:0;
 padding:0;
 overflow-y:auto;
 overflow-x:hidden;
 position:fixed;
-width:250px;
+width:160px;
 }
 div#srv_CSSstyles ul li{
 padding:8px;
-width:202px;
+width:130px;
+overflow: hidden;
+white-space: nowrap;
 
 }
 div#srv_CSSstyles ul li, div#srv_CSSstyles a, div#srv_CSSstyles a:link, div#srv_CSSstyles a:hover {
@@ -69,11 +76,52 @@ margin:0;
 padding:0;
 }
 
+/* ------------ new Insert dialog ------- */
 
+#srv_insertMedia{
+top:0px;
+bottom:0px;
+left:0px;
+left:-340px;
+width:340px;
+position: fixed;
+}
+#srv_insertMedia img, #srv_insertMedia img a{
+border:0 none;
+outline:0 none;
+}
 
+/*--then...-*/
+.srv_mediaList{
+top:0px;
+left:-340px;
+width:340px;
+position:fixed;
+list-style:none;
+margin:0;
+padding:0;
+height:66px;
+border-bottom:1px solid #909090;
+background-image: -moz-linear-gradient(top, #d4d4d4, #c4c4c4); /* FF3.6 */
+background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, #d4d4d4),color-stop(1, #c4c4c4)); /* Saf4+, Chrome */
+-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#d4d4d4', EndColorStr='#c4c4c4')"; /* IE8 */
+}
 
+li.imageinsert{
 
-
+}
+.srv_filePane {
+overflow:auto;
+top:67px;
+bottom:0px;
+left:-340px;
+width:120px;
+position:fixed;
+height:auto;
+margin:0;
+background: #aaa;
+border-right:1px solid #909090;
+}