I'm a big dummy

pygeek · Mar 22, 2011 · 4e44710 · 4e44710
1 parent 4b9b0fa
commit 4e44710
Show file tree

Hide file tree

Showing 5 changed files with 151 additions and 113 deletions.
diff --git a/servee/contrib/media/image/templates/servee/wysiwyg/insert/image/_detail.html b/servee/contrib/media/image/templates/servee/wysiwyg/insert/image/_detail.html
@@ -2,7 +2,7 @@
 	<div id="srv_insert_image_display">
 	   <img src="{{ object.image.url }}" />
 	</div>
-	<h5 id="srv_insert_image_title">{{ object.title }}</h5>
+	<p id="srv_insert_image_title">{{ object.title }}</p>
 	<p id="srv_insert_image_description"></p>
 	<input type="hidden" name="srv_insert_image_pk" id="srv_insert_image_pk" value="{{ object.pk }}">
 	<input type="button" class="srv_button insert" id="srv_insert_image_action" value="Place image at Cursor">

diff --git a/servee/frontendadmin/static/servee/css/admin.css b/servee/frontendadmin/static/servee/css/admin.css
@@ -1,6 +1,4 @@
 @import url(inline-type-forms.css);
 @import url(overlay.css);
 @import url(overlay-type-forms.css);
-@import url(animate.css);
-
-/*@import url(formOverrides.css);*/
+@import url(animate.css);
diff --git a/servee/frontendadmin/static/servee/css/djAdmin.css b/servee/frontendadmin/static/servee/css/djAdmin.css
@@ -1,36 +0,0 @@
-/*--- don't know what these are anymore... scrapping soon ---*/
-
-body fieldset.frontendadmin p, body fieldset.frontendadmin{
-background: none transparent;
-border:0 none;
-padding:0;
-}
-body fieldset.frontendadmin p input[type="text"], body fieldset.frontendadmin p input[type="password"], body fieldset.frontendadmin p textarea {
-border:1px solid #ccc;
-border-bottom:1px solid #eee;
-padding:4px;
-}
-body fieldset.frontendadmin textarea{
-height:375px;
-}
-
-body .defaultSkin table.mceLayout {
-border-bottom:1px solid #eee;
-background:none transparent;
-} 
-body .defaultSkin .mceIframeContainer{
-border:0 none;
-}
-body .defaultSkin tr.mceLast{
-display: none;
-}
-
-/*- more inline edits -*/
-span#id_content_parent, textarea#id_content, input[id="id_title"]{
-width:100%;
-clear:both;
-}
-label[for="id_content"], label[for="id_title"]{
-text-align: left;
-}
-

diff --git a/servee/frontendadmin/static/servee/css/inline-type-forms.css b/servee/frontendadmin/static/servee/css/inline-type-forms.css
@@ -1,69 +1,4 @@
 
-/*----------------- green action button------------------*/
-button,
-input[type="reset"],
-input[type="submit"],
-input[type="button"], .srv_adminBox input[type="submit"] {
-	-webkit-appearance: none;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-	background: #139e04;
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #139e04), color-stop(1, #0f6705));
-	background: -moz-linear-gradient(top center, #139e04 0%, #0f6705 100%);
-	border: 1px solid;
-	border-color: #0c590a #094b08 #094d08;
-	cursor: pointer;
-	color: #fff;
-	font: bold 14px/1.2 sans-serif;
-	outline: 0;
-	overflow: visible;
-	padding: 6px 10px 8px;
-	text-shadow: 0 -1px 1px #0d5c05;
-	width: auto;
-	margin:0 0 36px 0px;
-	-moz-box-shadow: 0px 1px 1px rgba(0,0,0,0.3);
-	-webkit-box-shadow: 0px 1px 1px rgba(0,0,0,0.3);
-	box-shadow: 0px 1px 1px rgba(0,0,0,0.3);
-	height:auto;
-
-	/* IE7 */
-	*padding-top: 2px;
-	*padding-bottom: 0px;
-}
-button,
-input[type="reset"]:hover,
-input[type="submit"]:hover,
-input[type="button"]:hover,
-a.edit:hover{
-	background: #15c102;
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #15c102), color-stop(1, #0f6705));
-	background: -moz-linear-gradient(top center, #15c102 0%, #0f6705 100%);
-
-}
-button,
-input[type="reset"]:active,
-input[type="submit"]:active,
-input[type="button"]:active,
-a.edit:active{
-	background: #0f6705;
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #0f6705), color-stop(1, #15c102));
-	background: -moz-linear-gradient(top center, #0f6705 0%, #15c102 100%);
-
-}
-button {
-	/* IE7 */
-	*padding-top: 1px;
-	*padding-bottom: 1px;
-}
-
-button[disabled],
-input[type="reset"][disabled],
-input[type="submit"][disabled],
-input[type="button"][disabled] {
-	color: #888;
-}
-
 /*---------------inline editor buttons -------------------------------------------------------*/
 
 a.frontendadmin_add, a.frontendadmin_delete, a.frontendadmin_edit{
@@ -92,3 +27,92 @@ a.frontendadmin_edit{ 			background:url(../images/small-icons.png) no-repeat -2p
 a.frontendadmin_add:hover{ 		background:url(../images/small-icons.png) no-repeat -2px -57px;}
 a.frontendadmin_delete:hover{ 	background:url(../images/small-icons.png) no-repeat -2px -93px;}
 a.frontendadmin_edit:hover{ 	background:url(../images/small-icons.png) no-repeat -2px -75px;}
+
+
+
+/*----- editor forms - uniForm overrides-------*/
+
+span#id_content_parent, textarea#id_content, input[id="id_title"]{
+width:100%;
+clear:both;
+}
+label[for="id_content"], label[for="id_title"]{
+text-align: left;
+}
+tr.mceLast{display:none;}
+
+
+/*-------- editor forms - things borrowed from DJ base.css----*/
+
+/* OBJECT TOOLS */
+
+.object-tools {
+    font: bold 10px/12px sans-serif;
+    padding-left: 0;
+    float: right;
+    position: relative;
+    margin-top: -2.4em;
+    margin-bottom: -2em;
+}
+
+.form-row .object-tools {
+    margin-top: 5px;
+    margin-bottom: 5px;
+    float: none;
+    height: 2em;
+    padding-left: 3.5em;
+}
+
+.object-tools li {
+    display: block;
+    float: left;
+    background: url(../img/admin/tool-left.gif) 0 0 no-repeat;
+    padding: 0 0 0 8px;
+    margin-left: 2px;
+    height: 16px;
+}
+
+.object-tools li:hover {
+    background: url(../img/admin/tool-left_over.gif) 0 0 no-repeat;
+}
+
+.object-tools a:link, .object-tools a:visited {
+    display: block;
+    float: left;
+    color: white;
+    padding: .1em 14px .1em 8px;
+    height: 14px;
+    background: #999 url(../img/admin/tool-right.gif) 100% 0 no-repeat;
+}
+
+.object-tools a:hover, .object-tools li:hover a {
+    background: #5b80b2 url(../img/admin/tool-right_over.gif) 100% 0 no-repeat;
+}
+
+.object-tools a.viewsitelink, .object-tools a.golink {
+    background: #999 url(../img/admin/tooltag-arrowright.gif) top right no-repeat;
+    padding-right: 28px;
+}
+
+.object-tools a.viewsitelink:hover, .object-tools a.golink:hover {
+    background: #5b80b2 url(../img/admin/tooltag-arrowright_over.gif) top right no-repeat;
+}
+
+.object-tools a.addlink {
+    background: #999 url(../img/admin/tooltag-add.gif) top right no-repeat;
+    padding-right: 28px;
+}
+
+.object-tools a.addlink:hover {
+    background: #5b80b2 url(../img/admin/tooltag-add_over.gif) top right no-repeat;
+}
+
+/* OBJECT HISTORY */
+
+table#change-history {
+    width: 100%;
+}
+
+table#change-history tbody th {
+    width: 16em;
+}
diff --git a/servee/frontendadmin/static/servee/css/overlay-type-forms.css b/servee/frontendadmin/static/servee/css/overlay-type-forms.css
@@ -1,15 +1,11 @@
 /*  type styles----*/
 
-#srv_adminLarge a, ul#srv_adminList a{
-border-bottom:0 none;
-}
-
-.srv_adminBox h5{
-color: #333;
+.srv_adminBox, .srv_adminBox p{
 font: normal 12px/16px sans-serif;
+color: #333;
+}
+p#srv_insert_image_title{
 margin:9px 0 18px;
-text-transform: none;
-letter-spacing: normal;
 }
 
 
@@ -96,4 +92,60 @@ button:focus,button:active,input:focus,input:active,select:focus,select:active,t
 	background-color: rgba(255,255,255,0.85);
 	/* for Opera */
 	z-index: 1;
+}
+
+/*----------------- green action button------------------*/
+button,
+input[type="reset"],
+input[type="submit"],
+input[type="button"], .srv_adminBox input[type="submit"], .srv_adminBox input[type="button"] {
+	-webkit-appearance: none;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	background: #139e04;
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #139e04), color-stop(1, #0f6705));
+	background: -moz-linear-gradient(top center, #139e04 0%, #0f6705 100%);
+	border: 1px solid;
+	border-color: #0c590a #094b08 #094d08;
+	cursor: pointer;
+	color: #fff;
+	font: bold 14px/1.2 sans-serif;
+	outline: 0;
+	overflow: visible;
+	padding: 6px 10px 8px;
+	text-shadow: 0 -1px 1px #0d5c05;
+	width: auto;
+	margin:0 0 36px 0px;
+	-moz-box-shadow: 0px 1px 1px rgba(0,0,0,0.3);
+	-webkit-box-shadow: 0px 1px 1px rgba(0,0,0,0.3);
+	box-shadow: 0px 1px 1px rgba(0,0,0,0.3);
+	height:auto;
+
+	/* IE7 */
+	*padding-top: 2px;
+	*padding-bottom: 0px;
+}
+button:hover,
+input[type="reset"]:hover,
+input[type="submit"]:hover,
+input[type="button"]:hover, .srv_adminBox input[type="submit"]:hover, .srv_adminBox input[type="button"]:hover{
+	background: #15c102;
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #15c102), color-stop(1, #0f6705));
+	background: -moz-linear-gradient(top center, #15c102 0%, #0f6705 100%);
+
+}
+button:active,
+input[type="reset"]:active,
+input[type="submit"]:active,
+input[type="button"]:active, .srv_adminBox input[type="submit"]:active, .srv_adminBox input[type="button"]:active{
+	background: #0f6705;
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #0f6705), color-stop(1, #15c102));
+	background: -moz-linear-gradient(top center, #0f6705 0%, #15c102 100%);
+
+}
+button {
+	/* IE7 */
+	*padding-top: 1px;
+	*padding-bottom: 1px;
 }