refinerycms 0.9.6.34 → 0.9.7

data/public/javascripts/wymeditor/lang/en.js

@@ -1,47 +1,47 @@
 WYMeditor.STRINGS['en'] = {
-	Strong:			 'Strong',
-	Bold:			 'Bold',
-	Emphasis:		 'Emphasis',
-	Superscript:		'Superscript',
-	Subscript:		'Subscript',
-	Ordered_List:	 'Ordered List',
-	Unordered_List:	 'Unordered List',
-	Indent:			 'Indent',
-	Outdent:			'Outdent',
-	Undo:			 'Undo',
-	Redo:			 'Redo',
-	Link:			 'Add a Link',
-	Unlink:			 'Remove Link',
-	Image:			'Insert an Image',
-	Table:			'Insert a Table',
-	HTML:			 'HTML',
-	Paragraph:		'Paragraph',
-	Heading_1:		'Heading 1',
-	Heading_2:		'Heading 2',
-	Heading_3:		'Heading 3',
-	Heading_4:		'Heading 4',
-	Heading_5:		'Heading 5',
-	Heading_6:		'Heading 6',
-	Preformatted:	 'Preformatted',
-	Blockquote:		 'Blockquote',
-	Table_Header:	 'Table Header',
-	URL:				'URL',
-	Title:			'Title',
-	Alternative_Text: 'Alternative text',
-	Caption:			'Caption',
-	Summary:			'Summary',
-	Number_Of_Rows:	 'Number of rows',
-	Number_Of_Cols:	 'Number of cols',
-	Insert:			 'Insert', 
-	Submit:			 'Submit',
-	Cancel:			 'Cancel',
-	Choose:			 'Choose',
-	Preview:			'Preview',
-	Paste_From_Word:	'Paste',
-	Tools:			'Tools',
-	Containers:		 'Containers',
-	Classes:			'Classes',
-	Status:			 'Status',
-	Source_Code:		'Source code',
-		Css_Class: 				'Apply CSS Class'
-};
+  Strong:           'Strong',
+  Bold:             'Bold',
+  Emphasis:         'Emphasis',
+  Superscript:      'Superscript',
+  Subscript:        'Subscript',
+  Ordered_List:     'Ordered List',
+  Unordered_List:   'Unordered List',
+  Indent:           'Indent',
+  Outdent:          'Outdent',
+  Undo:             'Undo',
+  Redo:             'Redo',
+  Link:             'Add a Link',
+  Unlink:           'Remove Link',
+  Image:            'Insert an Image',
+  Table:            'Insert a Table',
+  HTML:             'HTML',
+  Paragraph:        'Paragraph',
+  Heading_1:        'Heading 1',
+  Heading_2:        'Heading 2',
+  Heading_3:        'Heading 3',
+  Heading_4:        'Heading 4',
+  Heading_5:        'Heading 5',
+  Heading_6:        'Heading 6',
+  Preformatted:     'Preformatted',
+  Blockquote:       'Blockquote',
+  Table_Header:     'Table Header',
+  URL:              'URL',
+  Title:            'Title',
+  Alternative_Text: 'Alternative text',
+  Caption:          'Caption',
+  Summary:          'Summary',
+  Number_Of_Rows:   'Number of rows',
+  Number_Of_Cols:   'Number of cols',
+  Insert:           'Insert',
+  Submit:           'Submit',
+  Cancel:           'Cancel',
+  Choose:           'Choose',
+  Preview:          'Preview',
+  Paste_From_Word:  'Paste your text below',
+  Tools:            'Tools',
+  Containers:       'Containers',
+  Classes:          'Classes',
+  Status:           'Status',
+  Source_Code:      'Source code',
+  Css_Class:        'Apply CSS Class'
+};

data/public/javascripts/wymeditor/lang/nl.js

@@ -1,5 +1,6 @@
 WYMeditor.STRINGS['nl'] = {
 	Strong:			 'Sterk benadrukken',
+	Bold:			 'Vet',
 	Emphasis:		 'Benadrukken',
 	Superscript:		'Bovenschrift',
 	Subscript:		'Onderschrift',
@@ -31,6 +32,7 @@ WYMeditor.STRINGS['nl'] = {
 	Summary:			'Summary',
 	Number_Of_Rows:	 'Aantal rijen',
 	Number_Of_Cols:	 'Aantal kolommen',
+	Insert:			 'Invoegen',
 	Submit:			 'Versturen',
 	Cancel:			 'Annuleren',
 	Choose:			 'Kiezen',
@@ -40,6 +42,6 @@ WYMeditor.STRINGS['nl'] = {
 	Containers:		 'Teksttypes',
 	Classes:			'Klassen',
 	Status:			 'Status',
-	Source_Code:		'Broncode'
-};
-
+	Source_Code:		'Broncode',
+	Css_Class: 			'Gebruik CSS klasse'
+};

data/public/javascripts/wymeditor/lang/pt-br.js

@@ -1,6 +1,7 @@
-WYMeditor.STRINGS['pt-br'] = {
+WYMeditor.STRINGS['pt-BR'] = {
+  Bold: 'Negrito',
 	Strong:			 'Resaltar',
-	Emphasis:		 'Enfatizar',
+	Emphasis:		 'Itálico',
 	Superscript:		'Sobre escrito',
 	Subscript:		'Sub escrito ',
 	Ordered_List:	 'Lista ordenada',

data/public/javascripts/wymeditor/lang/sl.js

@@ -0,0 +1,47 @@
+WYMeditor.STRINGS['sl'] = {
+  Strong:           'Močno',
+  Bold:             'Krepko',
+  Emphasis:         'Ležeče',
+  Superscript:      'Nadpisano besedilo',
+  Subscript:        'Podpisano besedilo',
+  Ordered_List:     'Oštevilčen Seznam',
+  Unordered_List:   'Označen Seznam',
+  Indent:           'Povečaj zamik',
+  Outdent:          'Zmanjšaj zamik',
+  Undo:             'Razveljavi',
+  Redo:             'Redo',
+  Link:             'Dodaj Povezavo',
+  Unlink:           'Odstrani Povezavo',
+  Image:            'Vstavi Sliko',
+  Table:            'Vstavi Tabelo',
+  HTML:             'HTML',
+  Paragraph:        'Odstavek',
+  Heading_1:        'Naslov 1',
+  Heading_2:        'Naslov 2',
+  Heading_3:        'Naslov 3',
+  Heading_4:        'Naslov 4',
+  Heading_5:        'Naslov 5',
+  Heading_6:        'Naslov 6',
+  Preformatted:     'Vnaprej Oblikovano',
+  Blockquote:       'Navedek',
+  Table_Header:     'Glava Tabele',
+  URL:              'URL',
+  Title:            'Naslov',
+  Alternative_Text: 'Alternativno besedilo',
+  Caption:          'Napis',
+  Summary:          'Povzetek',
+  Number_Of_Rows:   'Število vrstic',
+  Number_Of_Cols:   'Število kolon',
+  Insert:           'Vstavi',
+  Submit:           'Predloži',
+  Cancel:           'Prekliči',
+  Choose:           'Izberi',
+  Preview:          'Predogled',
+  Paste_From_Word:  'Prilepite vaše besedilo spodaj',
+  Tools:            'Orodja',
+  Containers:       'Zabojniki',
+  Classes:          'Razredi',
+  Status:           'Status',
+  Source_Code:      'Izvorna koda',
+  Css_Class:        'Uporabi CSS Razred'
+};

data/public/javascripts/wymeditor/skins/refinery/skin.js

@@ -1,40 +1,40 @@
 WYMeditor.SKINS['refinery'] = {
 
 	init: function(wym) {
-
-		//render following sections as panels
-/*		$(wym._box).find(wym._options.classesSelector)
-			.addClass("wym_panel"); */
-
 		//render following sections as buttons
 		$(wym._box).find(wym._options.toolsSelector)
-			.addClass("wym_buttons");
+			.addClass('wym_buttons');
 
-		//render following sections as dropdown menus
- /*		 $(wym._box).find(wym._options.classesSelector)
-			.addClass("wym_dropdown")
-			.find(WYMeditor.H2)
-			.append("<span>&nbsp;&gt;</span>");
-*/
 		// auto add some margin to the main area sides if left area
 		// or right area are not empty (if they contain sections)
-		$(wym._box).find("div.wym_area_right ul")
-			.parents("div.wym_area_right").show()
+		$(wym._box).find('div.wym_area_right ul')
+			.parents('div.wym_area_right').show()
 			.parents(wym._options.boxSelector)
-			.find("div.wym_area_main")
-			.css({"margin-right": "155px"});
+			.find('div.wym_area_main')
+			.css({'margin-right': '155px'});
 
-		$(wym._box).find("div.wym_area_left ul")
-			.parents("div.wym_area_left").show()
+		$(wym._box).find('div.wym_area_left ul')
+			.parents('div.wym_area_left').show()
 			.parents(wym._options.boxSelector)
-			.find("div.wym_area_main")
-			.css({"margin-left": "155px"});
+			.find('div.wym_area_main')
+			.css({'margin-left': '155px'});
 
 		//make hover work under IE < 7
-		$(wym._box).find(".wym_section").hover(function(){
-			$(this).addClass("hover");
+		$(wym._box).find('.wym_section').hover(function(){
+			$(this).addClass('hover');
 		},function(){
-			$(this).removeClass("hover");
+			$(this).removeClass('hover');
 		});
+
+    // adjust sizing
+    $(wym._box).css('width', $(wym._element).width() - 2)
+      .find('.wym_iframe iframe').css('width', $(wym._box).width() - 2);
+
+		$('.button').corner('6px');
+		$(".wym_area_top li>a").corner("2px");
+
+		$(".wym_skin_refinery").animate({
+			opacity: 1
+		}, 800);
 	}
 };

data/public/robots.txt

@@ -1,2 +1,3 @@
 User-Agent: *
 Disallow: /admin/
+Disallow: /refinery/

data/public/stylesheets/application.css

@@ -1,5 +1,5 @@
 @import url('refinery/application.css');
-/*	
-	Override default refinery application CSS below. 
-	Formatting applies to all frontend.
+/*  
+  Override default refinery application CSS below. 
+  Formatting applies to all frontend.
 */

data/public/stylesheets/formatting.css

@@ -1,5 +1,5 @@
 @import url('refinery/formatting.css');
-/*	
-	Override default refinery formatting below. 
-	Formatting applies to backend WYSIWYG editors and all frontend. 
+/*  
+  Override default refinery formatting below. 
+  Formatting applies to backend WYSIWYG editors and all frontend. 
 */

data/public/stylesheets/home.css

@@ -1,5 +1,5 @@
 @import url('/stylesheets/refinery/home.css');
 /* 
-	Override default refinery homepage styles here. 
-	These only apply to the homepage of your site. 
+  Override default refinery homepage styles here. 
+  These only apply to the homepage of your site. 
 */

data/public/stylesheets/ie7.css

@@ -0,0 +1 @@
+@import url('/stylesheets/refinery/ie.css');

data/public/stylesheets/refinery/application.css

@@ -1,11 +1,13 @@
 body {
   margin: 0px;
 }
-#page {
-  padding: 20px;
+#page, #site_bar_content {
   width: 1000px;
   margin: 0px auto;
 }
+#page {
+  padding: 20px;
+}
 #body_content_left {
   float: left;
   width: 600px;

data/public/stylesheets/refinery/formatting.css

@@ -1,17 +1,17 @@
 /* Default error colouring */
 
 div.fieldWithErrors {
-	display: inline;
+  display: inline;
 }
 
 #errorExplanation {
-	border-top: 3px solid #F27F7F;
-	background: #FFBEBE;
-	padding: 10px;
+  border-top: 3px solid #F27F7F;
+  background: #FFBEBE;
+  padding: 10px;
 }
 
 #errorExplanation, #errorExplanation *, .fieldWithErrors, .fieldWithErrors * {
-	color: #9C2626;
+  color: #9C2626;
 }
 
 /* Browser Hacks */
@@ -19,15 +19,15 @@ div.fieldWithErrors {
 /* remove borders from images */
 
 a img {
-	border: 0px none;
+  border: 0px none;
 }
 
 /*
 Firefox Dotted Line Fix
-	- http://sonspring.com/journal/removing-dotted-links
+  - http://sonspring.com/journal/removing-dotted-links
 */
 a:focus {
-	outline: none;
+  outline: none;
 }
 
 /*
@@ -36,18 +36,18 @@ Clearfix docs
  - IE7 change: http://www.456bereastreet.com/archive/200603/new_clearing_method_needed_for_ie7/
 */
 .clearfix:after {
-	content: ".";
-	display: block;
-	height: 0;
-	clear: both;
-	visibility: hidden;
+  content: ".";
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
 }
 .clearfix {
-	display: inline-block;
+  display: inline-block;
 }
 
 /* Hide from IE Mac \*/
 .clearfix {
-	display:block;
+  display:block;
 }
 /* End hide from IE Mac */

data/public/stylesheets/refinery/ie.css

@@ -0,0 +1,20 @@
+#content .form-actions .form-actions-left a.button {
+  height: 19px;
+  line-height: 19px;
+  padding-top: 3px;
+  padding-bottom: 3px;
+}
+#site_bar #editor_switch a {
+  height: 26px;
+  padding-top: 4px;
+  padding-bottom: 4px;
+  line-height: 26px;
+}
+.search_form input.button {
+  padding-left: 8px;
+  padding-right: 8px;
+}
+body.login input.larger, body.login input.larger:focus {
+  background-image: none !important;
+  padding: 0px;
+}

data/public/stylesheets/refinery/refinery.css

@@ -3,6 +3,10 @@
   font-family: Arial;
   font-size: 13px;
 }
+p {
+  font-size: 14px;
+  line-height: 18px;
+}
 html {
   min-height: 100%;
 }
@@ -10,70 +14,89 @@ body {
   min-height: 100%;
   margin: 0;
   padding: 0;
-  font: 10px/1.5em Verdana;
+  font-size: 10px;
+  font-family: Verdana;
+  line-height: 1.5em;
   background: black url('/images/refinery/page_bg.png') repeat;
 }
-
 acronym {
   cursor: help;
 }
-
+label[for] {
+  cursor: pointer;
+}
+#page_container, #site_bar_content, #header_content {
+  margin: 0px auto 10px auto;
+  text-align: left;
+  width: 990px;
+}
+#page_container {
+  width: 960px;
+  padding: 30px 15px;
+}
+#site_bar_content {
+  margin-bottom: 0px;
+}
+#content .field, #content .form-actions {
+  width: 100%;
+  position: relative;
+}
+#dialog_container #content .field, .dialog_container .field {
+  width: auto;
+}
+input.widest, textarea.widest {
+  width: 99%;
+}
+select.widest {
+  max-width: 99%;
+}
 #actions {
   float: right;
-  width: 36.1%;
+  width: 30.7%;
   padding-left: 15px;
+  padding-top: 0px;
 }
-
 #records {
   float: left;
-  width: 60.6%;
-  padding-right: 15px;
+  width: 67.7%;
 }
-
 #actions ul {
-  margin: 0;
+  margin: 0px 0px 18px 0px;
   padding: 0;
   list-style: none;
 }
-
 #actions li a {
-  background-color:#F6F5F4;
+  background-color: #dbedff;
   background-position: 12px;
   background-repeat: no-repeat;
-  border:1px solid #B7B7A8;
-  display:block;
-  padding:9px 12px 9px 36px;
+  border: 1px solid #65C3F7;
+  display: block;
+  padding: 9px 12px 9px 36px;
 }
 #actions li a:hover {
-  text-decoration: underline;
+  background-color: #cae7fb;
+}
+#actions li a:active, #actions li.selected a {
+  background-color: #22A7F2;
+	color: white;
 }
-
 #actions li {
   margin-top: 10px;
 }
-
 #sort-status {
   padding: 5px 5px 5px 0px;
 }
-
 hr {
   border: 0;
   border-top: 1px solid #484743;
 }
-
-.form-actions {
-  margin-top: 10px;
-}
-
 .actions img {
   border: none;
 }
-
 .actions a, .actions a:hover {
   border: none;
   text-decoration: none;
 }
-
 .errorExplanation {
   background: 7px 10px no-repeat url('/images/refinery/icons/cancel.png') #FFB1B1;
   padding: 0px 5px 5px 30px;
@@ -82,57 +105,82 @@ hr {
   margin-bottom: 5px;
   border: 1px solid red;
 }
-
 .errorExplanation h2 {
   color: red;
   text-transform: none;
   display: none;
 }
-
 .errorExplanation p {
   font-weight: normal;
 }
-
 .fieldWithErrors input, .fieldWithErrors textarea {
-  border: 1px solid red;
-  background-color: #FFECF0;
-}
-
-#flash {
-  width: 545px;
+  border: 1px solid red !important;
+  background-color: #FFECF0 !important;
 }
-.login #flash {
-  width: 520px;
+.fieldWithErrors iframe {
+  border: 1px solid red !important;
 }
 #message, #flash {
   padding: 8px 8px 8px 30px;
-  margin-bottom: 5px;
+  margin-bottom: 15px;
+  position: relative;
 }
-
-.flash_notice {
+.flash_notice, .flash_message {
   border: 1px solid #00A017;
   color: #00A017;
   background: 7px 7px no-repeat url('/images/refinery/icons/accept.png') #E0F5E0;
 }
-
 .flash_notice, .flash_notice * {
   color: #00A017;
 }
-
 .flash_error {
   border: 1px solid #A00027;
   color: #A00027;
   background: 7px 7px no-repeat url('/images/refinery/icons/cancel.png') #FFB1B1;
 }
-
+#flash.flash_notice #flash_close, #flash.flash_error #flash_close {
+  text-transform: lowercase;
+}
+#flash.flash_message {
+  background: #E0F5E0;
+  padding: 9px;
+  position: relative;
+  margin-bottom: 32px;
+}
+#flash.flash_message h2 {
+  margin-top: 12px;
+}
+.flash_message, .flash_message * {
+  color: #262719;
+  font-size: 14px;
+}
+#flash a, #flash a:hover {
+  color: #e20003;
+  border-bottom-color: #e20003;
+}
+#flash.flash_error a, #flash.flash_error a:hover {
+  display: none;
+}
+#flash a#flash_close {
+  position: absolute;
+  right: 9px;
+  top: 7px;
+}
+#flash.flash_message a#flash_close {
+  top: 21px;
+}
+#header a, #content a {
+  border-bottom: 1px dotted #727272;
+}
 a {
   color: #41403C;
   text-decoration: none;
-  border-bottom: 1px dotted #727272;
 }
-
+#content .wym_box a, #content .ui-tabs a {
+  border-bottom: 0px none;
+}
 .splash #content {
-  background-image: url('/images/refinery/admin_bg.png');
+  background-color: white;
   background-repeat: repeat-y;
 }
 #content h1 {
@@ -142,199 +190,180 @@ a {
   border-bottom: 1px solid #99998B;
   padding-bottom: 10px;
 }
-
 .less-important {
   color: #727272;
 }
-
-#header a, #administration_tabnav a, #submenu a {
+#header a {
   border: 0px;
 }
-
 a:hover {
   color: #000;
   border-bottom: 1px solid #727272;
 }
-
-#page_container {
-  margin: 0px auto 10px auto;
-  text-align: left;
-  width: 990px;
+a#site_bar_refinery_cms_logo {
+  left: 448px;
 }
-
-body.login #page_container #page, #page_container.splash #page, #content {
-  background-color: #f6f5f4;
+#content, #page_container {
+  background-color: white;
 }
-
-body.login #page_container, body.login #site_bar_content, body.login #site_bar_branding  {
+body.login #page_container, body.login #site_bar_content, body.login #header_content {
   width: 590px;
 }
-
-body.login #header {
-  display: none;
+body.login #page_container {
+  width: 560px;
 }
-
-body.login #editor_switch {
-  display: none;
+body.login #header_content {
+  background: #eaeaea;
 }
-
-body.login #site_bar_branding img {
-  float: right;
-  margin-top: 10px;
+body.login #site_bar_content a#site_bar_refinery_cms_logo {
+  left: 247px;
 }
-
 #page_container .login #page h1 {
   margin: 0;
   padding: 5px;
   font-size: 20px;
   line-height:22px
 }
-
-body.login #page_container div.session_username, body.login #page_container div.session_password {
-  float: left;
+body.login #page_container div.remember_me label {
+  display: inline;
 }
-
-body.login #page_container div.session_password {
-  margin-left: 25px;
+body.login #page_container div.actions {
+  margin-top: 12px;
+}
+body.login label {
+  margin-top: 0px;
+}
+body.login .field {
+  margin-bottom: 20px;
+}
+body.login .field.remember_me, body.login .field.forgot_password {
+  margin-bottom: 0px;
+  margin-top: 0px;
+}
+body.login .field.forgot_password {
+  text-align: right;
+}
+body.login .field.remember_me label {
+  margin-top: 20px;
 }
-
 body.login #page_container div.remember_me {
-  margin-top: 12px;
+  width: 300px;
+  float: left;
 }
-
 body.login #page_container div.forgot_password {
   float: right;
-
-  margin-top: 11px;
-  margin-right: 3px;
+  width: 200px;
 }
-
-body.login #page_container div.remember_me label {
-  display: inline;
+body.login label, body.login a {
+  font-size: 14px;
 }
-
-body.login #page_container div.session_username input, body.login #page_container div.session_password input {
-  width: 260px;
+body.login #flash_container, body.login .errorExplanation {
+  margin-bottom: 12px;
 }
-
-body.login #page_container div.actions {
-  margin-top: 12px;
+div.field.plugin_access ul#plugins li {
+  margin-top: 3px;
 }
-
-#header ul#menu {
+div.field.plugin_access {
+  margin-top: 20px;
+}
+div.field.plugin_access .label_with_help a {
+  font-weight: normal;
+}
+/* Works in Firefox, Safari, Chrome, IE8+ */
+body.login input.larger {
+  background: url('/images/refinery/text_field_background.png') repeat-x white;
+  height: 31px;
+}
+body.login input.larger:focus {
+  background-position: 0px -41px;
+}
+body.login .fieldWithErrors input.larger {
+  background-position: 0px -82px;
+  border: 1px solid red;
+}
+#header_content {
+  height: 60px;
+  position: relative;
+  margin-bottom: 0px;
+}
+body.login #header_content h1 {
+  color: #41403c;
+  vertical-align: middle;
+  text-align: center;
+  font-weight: bold;
+  font-size: 18px;
+  padding-bottom: 0px;
+  line-height: 60px;
+}
+#menu {
   display: block;
   margin: 0px;
   padding: 0px;
   position: absolute;
   bottom: 0px;
-  left: 15px;
-  right: 15px;
-}
-
-#header ul#menu li#logout {
-  float: right;
+  left: 0px;
+  right: 0px;
+  background: transparent;
 }
-
-#header #menu.ui-sortable li a {
+#menu.ui-sortable a {
   cursor: move;
 }
-#header #menu.ui-sortable-disabled li a {
+#menu.ui-sortable-disabled a {
   cursor: pointer;
 }
-#header  li {
-  float: left;
-  margin-right: 2px;
-  list-style: none;
-}
-
-#header li a {
+#menu a {
   display: block;
   padding: 9px 13px;
-  font-size: 14px;
-  background-color: #c2c2b3;
+  font-size: 13px;
+  background: url('/images/refinery/nav_inactive_background.png') transparent repeat;
   margin-top:4px;
+  color: white;
+  font-weight: normal;
+  float: left;
+  margin-right: 2px;
+  position: relative;
 }
-
-#header li a:hover {
-  background-color: #deded9;
+#menu a.active, #menu a:hover, #menu a:focus {
+  background-color: white;
+  color: #ff5500;
 }
-
-#header li a.active {
-  background-color: #f6f5f4;
+#menu a.active {
   padding: 11px 13px;
   margin-top: 0px;
 }
-
-#header #menu li a#menu_reorder, #header #menu li a#menu_reorder_done {
-  height: 10px;
+#menu a#menu_reorder, #header #menu a#menu_reorder_done {
+  height: 14px;
+  width: 14px;
   margin-top: 11px;
+  padding: 6px;
   cursor: pointer;
-  background-color: #8a8a72;
-  background-repeat: no-repeat;
-  background-position: 7px;
-  width: 4px;
-  _margin-top: 8px;
-  padding: 8px 12px;
-}
-#header #menu li a#menu_reorder:hover, #header #menu li a#menu_reorder_done:hover {
-  background-color: #a1a18b;
-}
-#header #menu li a#menu_reorder {
-  background-image: url('/images/refinery/icons/arrow_switch.png');
-}
-#header #menu li a#menu_reorder_done {
-  background-image: url('/images/refinery/icons/tick.png');
+  vertical-align: middle;
+  text-align: center;
 }
-
 #content {
-  padding: 15px;
+  padding: 0px;
 }
-
 pre {
   margin: 0;
   padding: 0;
 }
-
-.clearfix:after {
-  content: ".";
-  display: block;
-  height: 0;
-  clear: both;
-  visibility: hidden;
-}
-
 .preview {
   color: #A3A093;
 }
-
-#header {
-  padding: 26px 15px 0 15px;
-  position: relative;
-  height: 18px;
-}
-
-body.login #page_container #header {
-  padding: 42px 15px 42px 15px;
-  height: 35px;
-}
-
 #site_link {
   display: block;
   color: #C2C2B3;
   float: left;
 
 }
-
 #site_link:hover {
   text-decoration: underline;
 }
-
 #header #logo {
   position: absolute;
   right: 20px;
   top: 25px;
 }
-
 #header h1, #header h1 a {
   color: white;
   font-size: 20px;
@@ -343,155 +372,136 @@ body.login #page_container #header {
   padding-bottom: 4px;
   margin-top: 0;
 }
-
 #header p {
   color: white;
   font-size: 90%;
   padding: 0;
   margin: 0;
 }
-
-#footer {
-  margin: 0px auto;
-  text-align: center;
-}
-
-#footer_logo {
-  border: 0px none;
-  display:inline-block;
-  *display:inline;
-  margin: 50px auto 40px auto;
-  width: auto;
-}
-
-#footer p, #footer a {
-  color: white;
-  font-size: 11px;
+.filter {
+  float: right;
 }
-
-#submenu {
-  clear: both;
-  padding-left: 10px;
-  background: url('/images/refinery/nav-3-background.gif') #EFEE8 repeat-x bottom;
+#records > ul, #records > #recent_activity > ul, #records > #recent_inquiries > ul {
+  margin-left: 0;
+  padding-left: 0;
 }
-
-#submenu ul {
+#records > ul li, #records > #recent_activity > ul li, #records > #recent_inquiries > ul li {
   list-style: none;
-  margin: 0;
-  padding: 0 0 0 10px;
+  padding: 0px 5px;
+  vertical-align: top;
+  margin-bottom: 2px;
+  line-height: 35px;
 }
-
-#submenu li {
-  float: left;
+#content #records > ul li .actions a {
+  line-height: 29px;
 }
-
-#submenu li a {
-  display: block;
-  padding: 6px;
+#records ul.clickable li {
+  padding: 0px;
+  margin-bottom: 0px;
 }
-
-#submenu2 {
-  margin-left: 10px;
-  margin-right: 12px;
+#records ul.clickable li a {
+  padding: 0px 5px;
+  vertical-align: top;
+  margin-bottom: 2px;
+  line-height: 35px;
+  display: block;
+  border-bottom: 0px none;
 }
-
-#submenu a {
-  color: #727272;
-  text-decoration: none;
+#records > #recent_activity, #records > #recent_inquiries {
+  float: left;
+  width: 48%;
 }
-
-.filter {
-  float: right;
+#records > #recent_inquiries {
+  margin-left: 21px;
 }
-
-#records ul {
-  list-style: none;
-  margin-left: 0;
-  padding-left: 0;
-}
-
-#records li {
-  padding: 2px 5px;
-  vertical-align: top;
-  margin-bottom: 2px;
+#records.one_list > #recent_activity, #records.one_list > #recent_inquiries {
+  width: 100%;
 }
-
 #records .left-column {
   float: left;
   width: 65%;
 }
-
 #records .left-column img {
   vertical-align: bottom;
   margin-top: 1px;
   margin-right: 5px;
 }
-
 #records .right-column {
   float: right;
   width: 34%;
   text-align: right;
 }
-
 #records .on {
-  background-color: #E6E5DC !important;
+  background-color: #EAEAEA;
 }
-#records .off {
-  background-color: #f6f5f4 !important;
+#records .off, #records .on-hover {
+  background-color: white;
 }
-
-#records .on-hover, #pagination ul a:hover, #pagination .on {
-  background: url('/images/refinery/hover-gradient.jpg') repeat-x bottom #D4D4C6
+#pagination ul a:hover, #pagination .on {
+  background: url('/images/refinery/hover-gradient.jpg') repeat-x bottom #D4D4C6;
 }
 #records ul.empty {
   display: none;
 }
-
-/* order of specificity: class rules need to be ruled important otherwise id based rules override them */
-.tree ul li ul {
+#records.tree ul li ul, .tree ul li ul {
   padding: 0;
 }
-
-.tree ul li {
-  margin: 0 !important;
-  padding: 5px 0 0 40px !important;
+#records.tree ul li, .tree ul li {
+  margin: 0px;
+  padding: 4px 0 0 40px;
   background: url('/images/refinery/branch.gif') no-repeat 15px 0px;
 }
-
-.tree .on-hover, #pagination ul.tree a:hover, #pagination .tree .on {
+#records.tree .on-hover, #pagination ul.tree a:hover, #pagination .tree .on {
   background: url('/images/refinery/branch.gif') no-repeat 15px 0px;
 }
-
-.tree ul li.branch_start {
+#records.tree ul li.branch_start, .tree ul li.branch_start {
   background-image: url('/images/refinery/branch-start.gif');
 }
-.tree ul li.branch_end {
+#records.tree ul li.branch_end, .tree ul li.branch_end {
   background-image: url('/images/refinery/branch-end.gif');
 }
-
-.tree li span.spacing {
+#records.tree li {
+  line-height: 25px;
+}
+#records.tree li span.spacing, .tree li span.spacing {
   display: none;
 }
+#records.tree ul li > div:hover, .tree ul li > div:hover {
+  background-color: #EAEAEA;
+}
+#records.tree ul.ui-sortable li div:hover, .tree ul.ui-sortable li div:hover {
+  background-color: inherit;
+}
+#records ul#sortable_list {
+  margin-top: 6px;
+}
+#records ul#sortable_list.ui-sortable {
+  margin-top: 0px;
+}
 #content .ui-sortable li.hover {
   height: 300%;
   display: block;
 }
-
 #content .ui-sortable {
   margin: 0;
   padding: 12px 0px;
 }
-
-#content .ui-sortable li ul{
-  padding: 6px 10px 12px 40px !important;
+#content #records > .ui-sortable {
+  padding-top: 10px;
 }
-
-#content ul.ui-sortable li {
-  background: #E6E5DC !important;
+#content #records ul.ui-sortable li ul, #content .ui-sortable li ul {
+  padding: 6px 10px 12px 40px;
+}
+#content #records ul.ui-sortable li, #content ul.ui-sortable li {
+  background-image: none;
+  background-color: #EAEAEA;
   cursor: move;
-  border: 1px solid #b7b7a8;
-  margin-bottom: 2px !important;
-  padding: 3px 0px 0px 3px !important;
+  border: 1px solid #ccc;
+  margin-bottom: 6px;
+  padding: 3px 0px 0px 3px;
+}
+#content #records ul.ui-sortable li ul li, #content ul.ui-sortable li {
+  background-color: #F2F2F2;
 }
 #content ul.ui-sortable li ul.empty {
   display: block;
@@ -510,11 +520,22 @@ body.login #page_container #header {
   min-height: 12px;
 }
 #content .ui-sortable li.placeholder {
-  opacity: 0.4;
+  opacity: 0.7;
   border-width: 2px;
   border-style: dashed;
   height: 38px;
 }
+#content .tree .ui-sortable li.placeholder {
+  height: 6px;
+  border-width: 2px;
+  position: absolute;
+  background: #22A7F2 !important;
+}
+#content #records .tree .ui-sortable li.helper, #content .tree .ui-sortable li.helper {
+  opacity: 0.5 !important;
+}
+#content .tree .ui-sortable li.below-placeholder {
+}
 #content ul.ui-sortable li.ui-sortable-helper {
   height: 38px !important;
 }
@@ -524,34 +545,32 @@ body.login #page_container #header {
 .ui-sortable-helper {
   opacity: 0.7;
 }
-
 #content h2 {
-  font-size: 140%;
-  color:#41403C;
+  font-size: 18px;
+  color:#41403c;
   margin-bottom: 15px;
   margin-top: 10px;
+  font-weight: bold;
+}
+#records h2, #actions h2 {
+  margin-top: 0px;
 }
-
 .pagination {
   background-color: #C9DAE2;
   padding: 7px;
   margin: 10px 0px;
 }
-
 .pagination .disabled {
   color: #A8B9C1;
 }
-
-.pagination a, .current, .disabled  {
+.pagination a, #content .pagination a, .pagination .current, .disabled  {
   padding: 7px;
   line-height: 20px;
-  border: none;
+  border-bottom: 0px none;
 }
-
 .pagination .current, .pagination a:hover {
   background: #A8B9C1;
 }
-
 #dialog-form-actions .pagination {
   margin: -4px 6px -4px 0px;
   float: right;
@@ -560,44 +579,36 @@ body.login #page_container #header {
 #dialog-form-actions .pagination a, #dialog-form-actions .pagination .current, #dialog-form-actions .pagination .disabled {
   line-height: 15px;
 }
-
 textarea {
   line-height: 20px;
   padding: 5px;
 }
-
 .field-couple {
   margin-bottom: 20px;
 }
-
 .submit {
-  border: auto;
+  border: inherit;
   width: auto;
   height: 25px;
 }
-
-label {
-  font-size: 110%;
+label, .label_with_help {
   margin-bottom: 5px;
   font-weight: bold;
   margin-top: 20px;
   display: block;
 }
-
 label.input_label {
   font-size: inherit;
-  margin-bottom: inerhit;
+  margin-bottom: inherit;
   display: inline;
   font-weight: normal;
   margin-top: inherit;
 }
-
 small label {
   font-size: inherit;
   font-weight: inherit;
   display: inherit;
 }
-
 label.stripped {
   float: none;
   display: inline;
@@ -606,160 +617,163 @@ label.stripped {
   margin: 0px;
   padding: 0px;
 }
-
-.form-actions {
-  background-color: white;
-  padding: 10px;
-  border: 1px solid #CCC;
-}
-
 #body_field {
   float: left;
   width: 60%;
 }
-
 .no_side_body {
   width: 72% !important;
 }
-
 #side_body_field {
   float: left;
   width: 38%;
   margin-left: 18px;
 }
-
-#body_field textarea, #side_body_field textarea {
-  width: 99%;
+#body_field textarea, #side_body_field textarea {
+  width: 99%;
+}
+.record .title span {
+  line-height: 30px;
+}
+#records.files .record .title, #dialog_main #resource_file_area #pages_list ul li a.page_link {
+  display:inline-block;
+  padding-left:24px;
+  min-height:16px;
+  background-repeat:no-repeat;
+  background-position:left;
+  background-image: url('/images/refinery/icons/folder_page_white.png');
+}
+#dialog_main #resource_file_area #pages_list ul li a.page_link{
+  background-position:5px center;
+  display:block;
+}
+#records.files .record .title.pdf, #dialog_main #resource_file_area #pages_list ul li a.page_link.pdf {
+	background-image: url('/images/refinery/icons/pdf.png');
+}
+#records.files .record .title.jpg, #records.files .record .title.gif, #records.files .record .title.jpeg, #records.files .record .title.png, #records.files .record .title.tiff, #dialog_main #resource_file_area #pages_list ul li a.page_link.jpg, #dialog_main #resource_file_area #pages_list ul li a.page_link.jpeg, #dialog_main #resource_file_area #pages_list ul li a.page_link.gif, #dialog_main #resource_file_area #pages_list ul li a.page_link.png, #dialog_main #resource_file_area #pages_list ul li a.page_link.tiff {
+	background-image: url('/images/refinery/icons/img.png');
+}
+#records.files .record .title.doc, #records.files .record .title.pages, #records.files .record .title.docx, #dialog_main #resource_file_area #pages_list ul li a.page_link.doc, #dialog_main #resource_file_area #pages_list ul li a.page_link.docx, #dialog_main #resource_file_area #pages_list ul li a.page_link.pages {
+	background-image: url('/images/refinery/icons/doc.png');
+}
+#records.files .record .title.ppt, #records.files .record .title.keynote, #dialog_main #resource_file_area #pages_list ul li a.page_link.ppt, #dialog_main #resource_file_area #pages_list ul li a.page_link.keynote {
+	background-image: url('/images/refinery/icons/ppt.png');
+}
+#records.files .record .title.xls, #records.files .record .title.numbers, #dialog_main #resource_file_area #pages_list ul li a.page_link.xls, #dialog_main #resource_file_area #pages_list ul li a.page_link.numbers {
+	background-image: url('/images/refinery/icons/xls.png');
+}
+#records.files .record .title.zip, #records.files .record .title.rar, #dialog_main #resource_file_area #pages_list ul li a.page_link.zip, #dialog_main #resource_file_area #pages_list ul li a.page_link.rar {
+	background-image: url('/images/refinery/icons/zip.png');
 }
-
-.record .title span {
-  line-height: 30px;
+#records.files .record .title.mp3, #records.files .record .title.wav, #records.files .record .title.aiff, #records.files .record .title.m4a, #dialog_main #resource_file_area #pages_list ul li a.page_link.mp3, #dialog_main #resource_file_area #pages_list ul li a.page_link.wav, #dialog_main #resource_file_area #pages_list ul li a.page_link.aiff, #dialog_main #resource_file_area #pages_list ul li a.page_link.m4a {
+  background-image: url('/images/refinery/icons/music.png');
 }
-#records  .actions {
-  float: right;
+#records .record {
+  position: relative;
+}
+#records .actions {
+  position: absolute;
+  right: 0px;
+  top: 0px;
   width: 120px;
   text-align: right;
   display: block;
+  line-height: 28px;
 }
-
-.tree .actions {
-  margin-top: -6px;
+#records.tree .actions {
+  line-height: 22px;
+  margin-top: 1px;
 }
-
 .published {
   width: 25px;
   text-align: center;
 }
-
-.actions a {
+#content .actions a {
   display: block;
   float: right;
-  margin: 3px;
-  line-height: 16px;
+  margin: 3px 3px;
+  line-height: inherit;
+  border-bottom: 0px none;
+}
+
+#content #records.tree > ul li .actions a {
+  margin: 3px 3px 0px 3px;
+  line-height: 24px;
 }
 .actions a * {
   padding: 4px 4px 1px 4px;
 }
-
+.actions a img {
+  vertical-align: middle;
+  padding: 2px 4px 4px 4px;
+}
+#records.tree .actions a img {
+  padding-top: 4px;
+}
+#image_grid .actions a img {
+  padding: 4px 4px 1px 4px;
+  vertical-align: top;
+}
 .actions a:hover {
   color: #E6E5DC;
   background: #3F3E3A;
 }
-
 .actions a.cancel {
   color: #AF0027;
 }
-
 .actions a.cancel:hover {
   color: white;
   background: #AF0027;
 }
-
 .actions a.reorder_anchor:hover {
   background: inherit !important;
   cursor: move;
 }
-
 #other_records {
   width: 68%;
 }
-
-#recent_activity {
-  border-collapse: collapse;
-  width: 100%;
-}
-
-#recent_activity td {
-  padding: 5px;
-}
-
-#recent_activity td.time_ago {
-  text-align: right;
-  min-width: 80px;
-  max-width: 135px;
-}
-
-#recent_activity tr.on {
-  background: #E6E5DC;
-}
-
 #common_actions {
   margin: 0;
   padding: 0;
 }
-
 #common_actions li {
   margin: 0;
   list-style: none;
   padding: 5px 0px 5px 0px;
 }
-
 #common_actions li a {
   font-weight: bold;
 }
-
 .larger {
   font-size: 200%;
 }
-
 #actions a img {
   vertical-align: bottom;
   border: 0;
 }
-
 .brown_border {
   border: 1px solid #99998B;
 }
-
 #inquiry {
   border-collapse: collapse;
   width: 100%;
 }
-
 #inquiry td {
-  border-bottom: 1px solid #99998B;
+  border-bottom: 1px solid #CCCCCC;
   padding: 7px;
 }
-
+#inquiry tr:last-child td {
+  border-bottom: 0px;
+}
 body.dialog {
   background: #FFF;
 }
-
 body.dialog, body.wym_dialog {
   text-align: left;
 }
-
 #wym_hide_fields {
   display: none;
 }
-
-body.dialog #dialog_main {
-  background: #f6f5f4;
-}
-
-body.dialog span.selected_radio {
-  background: #f6f5f4;
-}
 body.dialog form {
   width: 100% !important;
 }
@@ -768,35 +782,32 @@ body.dialog form {
   line-height: 36px;
   height: 36px;
 }
-
 .dialog span.radio * {
   cursor: pointer;
   font-weight: bold;
 }
-
 .dialog #dialog_menu_left {
   width: 130px;
   float: left;
   margin-top: 9px;
 }
-
 .dialog #dialog_main {
   float: left;
   min-height: 405px;
   width: 756px;
 }
-
+.wym_dialog_table{
+	height:250px;
+}
 .dialog #existing_image_content {
   position: relative;
-  height: 391px;
+  height: 300px;
   padding: 12px;
 }
-
 .dialog #existing_image_area_content ul {
   margin: 0px;
   padding: 0px;
 }
-
 .dialog #existing_image_area_content ul li {
   list-style: none;
   padding: 0px;
@@ -811,23 +822,55 @@ body.dialog form {
   text-align: center;
   vertical-align: middle;
 }
-
 .dialog #existing_image_area_content ul li img {
   border: 4px solid transparent;
 }
-
 .dialog #existing_image_area_content ul li.selected img {
-  border: 4px solid black;
+  border: 4px solid #22A7F2;
+}
+.dialog #existing_image_size_area ul {
+  margin: 0px;
+  padding: 10px 0px 0px 0px;
+}
+.dialog #existing_image_size_area ul li {
+  float: left;
+  list-style: none;
+  margin: 0px 18px 0px 0px;
+  text-align:center;
+}
+.dialog #existing_image_size_area ul li.selected {
+
+}
+.dialog #existing_image_size_area ul li a {
+  display: block;
+  border: 1px solid #999999;
+  font-size: 10px;
+  /* The following default values are overridden below */
+	height: 90px;
+	width: 90px;
+	line-height: 90px;
+	margin-top:-20px
+}
+.dialog #existing_image_size_area ul li.selected a {
+  border-color: #22A7F2;
+  background: #22A7F2;
+  color: white;
+  font-weight: bold;
 }
+.dialog #existing_image_size_area #image_dialog_size_0 a { height: 30px; width: 30px; line-height: 30px; margin-top: 10px}
+.dialog #existing_image_size_area #image_dialog_size_1 a { height: 50px; width: 50px; line-height: 50px; margin-top:  0px}
+.dialog #existing_image_size_area #image_dialog_size_2 a { height: 70px; width: 70px; line-height: 70px; margin-top:-10px}
+.dialog #existing_image_size_area #image_dialog_size_3 a { height: 90px; width: 90px; line-height: 90px; margin-top:-20px}
+
+
 /*
 #dialog_main {
   position: relative;
 }
 */
 #existing_image_area_content {
-  height: 365px;
+  height: 238px;
 }
-
 #existing_image_area .pagination {
   background: #FFF;
   /*bottom: 0px;*/
@@ -838,35 +881,28 @@ body.dialog form {
   margin: 0px;
   width: 763px;
 }
-
 #upload_image_area, #upload_resource_area {
   padding: 12px;
 }
-
 .dialog #content {
   padding: 0px;
 }
-
 .wym_dialog #page {
   width: 940px;
   padding: 6px;
 }
-
 #dialog_main #pages_list {
   width: 100%;
 }
-
 #dialog_main #pages_list ul {
   margin: 12px 24px 24px 12px;
   padding: 0px;
 }
-
 #dialog_main #pages_list ul li {
   cursor: pointer;
   line-height: 24px;
   list-style: none;
 }
-
 #dialog_main #pages_list li.child a {
   padding-left: 27px;
 }
@@ -898,54 +934,57 @@ body.dialog form {
 #dialog_main #pages_list li a:hover {
   background-color: #C9DAE2;
 }
-
 #dialog_main .actions {
   margin-right: 48px;
 }
-
 #dialog_main #pages_list .linked a, #dialog_main #pages_list .linked a:hover {
   border: 1px solid #00A017;
   color: #00A017;
   background: 7px 7px no-repeat url('/images/refinery/icons/accept.png') #E0F5E0;
 }
-
 #dialog_main #pages_list .linked a em {
   color: #00A017;
 }
-
 #dialog_main #web_address_area, #dialog_main #email_address_area {
   padding: 12px;
 }
-
 #link_title {
   margin-top: 12px;
 }
-
 #link_title label {
   margin: 3px 0px 0px 0px !important;
   width: 130px;
   display: block;
   float: left;
 }
-
 #link_title input {
   width: 770px;
 }
-
 ul#menu.reordering_menu li a {
   cursor: move;
 }
-
 #site_bar {
-  background: none;
+  background: #22a7f2;
+  border-bottom: 0px none;
 }
-
-
-#site_bar_content {
-  width: 958px;
-  margin: 0px auto;
+#search {
+  border: 1px solid #b3b3b3;
+  line-height: 18px;
+  padding: 2px;
+  font-size: 16px;
+  width: 200px;
+}
+.search_form {
+  position: relative;
+}
+.search_form .button, .search_form .button-wrapper {
+  position: absolute;
+  right: 0px;
+  top: 0px;
+}
+form input[type=submit]:hover {
+  background: #65c3f7;
 }
-
 .clearfix:after {
   content:".";
   display:block;
@@ -965,139 +1004,128 @@ Firefox Dotted Line Fix
 a:focus {
   outline: none;
 }
-
 a img {
   border: 0px none;
 }
-
 /* icons */
 .add_icon {
   background-image: url('/images/refinery/icons/add.png');
 }
+.delete_icon {
+  background-image: url('/images/refinery/icons/delete.png');
+}
 .edit_icon {
   background-image: url('/images/refinery/icons/application_edit.png');
 }
 .reorder_icon {
    background-image: url('/images/refinery/icons/arrow_switch.png');
 }
-
 .user_comment_icon {
   background-image: url('/images/refinery/icons/user_comment.png');
 }
 .edit_email_icon {
   background-image: url('/images/refinery/icons/email_edit.png');
 }
-
+.spam_icon {
+  background-image: url('/images/refinery/icons/bin.png');
+}
+.spam_empty_icon {
+	background-image: url('/images/refinery/icons/bin_closed.png');
+}
+.email_icon {
+  background-image: url('/images/refinery/icons/email.png');
+}
 .back_icon {
   background-image: url('/images/refinery/icons/arrow_left.png');
 }
 .go_icon {
   background-image: url('/images/refinery/icons/application_go.png');
 }
-
 .success_icon {
   background-image: url('/images/refinery/icons/tick.png');
   padding: 0px 8px;
 }
-
 .failure_icon {
   background-image: url('/images/refinery/icons/cross.png');
   padding: 0px 8px;
 }
-
 /* page parts */
 
 ul#page_parts {
   float: left;
-  width: 95%;
+  width: 94%;
 }
-
 ul#page_parts, ul#page_parts_controls {
   margin: 20px 0 0 0;
   padding: 0;
 }
-
 ul#page_parts_controls {
   float: right;
   width: 5%;
+  margin-right: 3px;
 }
-
 ul#page_parts_controls li {
   list-style: none;
   float: right;
   margin: 12px 3px 0px 3px;
 }
-
 ul#page_parts_controls li a {
   border: 0px none;
 }
-
 ul#page_parts_controls img {
   vertical-align: middle;
 }
-
 #page_part_editors {
   clear:left;
 }
-
+a#toggle_advanced_options {
+	background: url('/images/refinery/icons/page_white_gear.png') no-repeat 0px 3px;
+	padding: 5px 5px 5px 22px;
+	border-bottom: none;
+}
+a#toggle_advanced_options:hover {
+	border-bottom:1px dotted #727272;
+}
 /* dialog stuff */
 #dialog_frame {
   width:952px;
-  height:430px;
+  height:460px;
   padding: 0px;
   border: 0px solid #F2F1ED;
 }
 .wym_hideables {
   display: none;
 }
-#TB_ajaxContent, #TB_ajaxContent.TB_modal {
-  padding: 0px;
-}
-.wym_dialog .form-actions, .ui-dialog .form-actions {
-  margin-top: 0px;
-  border: 0px none;
-  border-top: 1px solid #E8E8E8;
-}
-a#TB_closeWindowButton {
-  text-decoration: none;
-  border-bottom: 0px none;
-  position: absolute;
-  float: none;
-  top: 7px;
-  right: 6px;
-}
-#TB_title {
-  height: 33px;
-  line-height: 33px;
+#content .form-actions, .wym_dialog .form-actions, .ui-dialog .form-actions {
   position: relative;
+  background-color: #F2F2F2;
+  border: 1px solid #CCCCCC;
+  margin-top: 10px;
+  height: 45px;
 }
-#TB_ajaxWindowTitle {
-  float: none;
-  padding: 0px;
-  margin-left: 12px;
-  font-size: 16px;
-}
-#existing_image_area {
-  padding-top:6px;
+.wym_dialog .form-actions, #content.form-actions.dialog-form-actions, .ui-dialog .form-actions {
+  margin-top: 16px;
 }
-
-textarea.wymeditor {
+#content .form-actions .form-actions-left, #content .form-actions .form-actions-right,
+  .wym_dialog .form-actions .form-actions-left, .wym_dialog .form-actions .form-actions-right,
+  .ui-dialog .form-actions .form-actions-left, .ui-dialog .form-actions .form-actions-right {
+  position: absolute;
+  top: 10px;
 }
-#TB_closeAjaxWindow {
-  margin-bottom: 0px;
-  padding: 0px;
+#content .form-actions .form-actions-left, .wym_dialog .form-actions .form-actions-left, .ui-dialog .form-actions .form-actions-left {
+  left: 10px;
 }
-#TB_window div.field, .ui-dialog div.field {
-  margin: 0px 10px;
+#content .form-actions .form-actions-right, .wym_dialog .form-actions .form-actions-right, .ui-dialog .form-actions .form-actions-right {
+  right: 10px;
 }
-#TB_window .form-actions, .ui-dialog .form-actions {
-  margin-top: 12px;
+.wym_dialog .form-actions, .ui-dialog .form-actions {
+  border: 0px none;
+  border-top: 1px solid #E8E8E8;
 }
-
-#dialog_container {
-  padding: 0px 12px 12px 12px;
+#dialog_iframe {
+  position: relative;
 }
-#dialog_container .form-actions {
+#dialog_container #content .form-actions, .ui-dialog .form-actions, .dialog_container .form-actions {
   position: absolute;
   bottom: 0px;
   left: 0px;
@@ -1105,34 +1133,42 @@ textarea.wymeditor {
   border-right: 0px;
   border-left: 0px;
   border-bottom: 0px;
-  padding: 10px 0px;
+  width: auto;
 }
-#dialog_container .form-actions #submit_button, #dialog_container .form-actions .wym_submit {
-  margin-left: 10px;
+#existing_image_area {
+  padding-top:6px;
 }
-#dialog_main .form-actions {
-  position: inherit;
-  width: 97%;
-  border: 1px solid #E8E8E8;
-  padding: 10px;
+textarea.wymeditor {
+}
+.ui-dialog div.field {
+  margin: 0px 10px;
+}
+#dialog_container, .dialog_container {
+  padding: 12px;
 }
-
 ul#image_grid {
-  width: 580px;
+  width: 670px;/*580px;*/
   padding: 0px;
-  margin: 15px 0;
+  margin: 10px 0px 15px 0px;
 }
-
 ul#image_grid li {
+  position: relative;
   float: left;
-  margin: 0px 13px 12px 0px;
+  margin: 0px 12px 12px 0px;
   padding: 0px;
-  width: 135px;
+  width: 124px;
   text-align: center;
-  height: 176px;
+  height: 165px;
   overflow: hidden;
-  max-width: 135px;
-  max-height: 176px;
+  max-width: 124px;
+  max-height: 165px;
+}
+#records ul#image_grid li .actions {
+  top: auto;
+  bottom: 0px;
+}
+#records ul#image_grid li .actions a {
+  line-height: 24px;
 }
 ul#image_grid li.row-end {
   margin-right: 0px;
@@ -1167,17 +1203,14 @@ ul#plugins li {
 .label_inline_with_link a img {
   vertical-align: middle;
 }
-
 #remove_picked_image {
   margin-top:8px;
   display:inline-block;
   width:auto;
 }
-
 #new_page_part_dialog .field {
   padding: 30px 10px;
 }
-
 .hide-overflow {
   overflow: hidden;
 }
@@ -1186,18 +1219,203 @@ ul#plugins li {
   display:inline-block;
   width:auto;
 }
-
 /**** Tooltip Icons *****/
 .tooltip {
-  background: white;
-  border: 4px solid #606060;
-  padding: 6px;
+  background: #22a7f2;
+  border: 1px solid #1b82bd;
   word-wrap:break-word;
+	position: relative;
 }
-.tooltip * {
-  color: black;
+.tooltip span {
+	display: block;
+  padding: 10px;
+	border: 1px solid #62c1f6;
+}
+.tooltip-nib {
+	position: absolute;
+	z-index: 10001;
+}
+.tooltip, .tooltip * {
+  color: white;
 }
-
 .wym_dialog_paste .field textarea {
   width: 98%;
-}
+}
+.ui-dialog .wym_dialog_paste .field, .ui-dialog .wym_dialog_paste .field textarea {
+  margin: 0px 0px 45px 0px;
+  height: 300px;
+}
+input.button, a.button, #content a.button, span.button-wrapper, span.button-wrapper input {
+  cursor:pointer;
+  background: #22a7f2;
+  color: white;
+  padding: 0px 14px 0px 14px;
+  font-size: 14px;
+  line-height: 25px;
+  height: 25px;
+  display: inline-block;
+  border: 0px none;
+  margin-top: 0px;
+  margin-bottom: 0px;
+}
+/* for those pesky IE browsers */
+span.button-wrapper {
+	padding: 0px;
+}
+span.button-wrapper input {
+	display: inherit;
+}
+/* fixes firefox display */
+input.button {
+  padding-bottom: 3px;
+}
+input.button.close_dialog, a.button.close_dialog, #content a.button.close_dialog, span.button-wrapper.close_dialog, span.button-wrapper.close_dialog input {
+  background: #bcbcbc;
+}
+input.button:hover, a.button:hover, #content a.button:hover, span.button-wrapper:hover, span.button-wrapper:hover input {
+  background:#62bef2;
+}
+input.button.close_dialog:hover, a.button.close_dialog:hover, #content a.button.close_dialog:hover, span.button-wrapper.close_dialog:hover {
+  background: #cdcdcd;
+}
+input.button:active, a.button:active, #content a.button:active, span.button-wrapper:active, span.button-wrapper:active input {
+  background: #004a8f;
+}
+input.button.close_dialog:active, a.button.close_dialog:active, #content a.button.close_dialog:active, span.button-wrapper.close_dialog:active,  span.button-wrapper.close_dialog:active input {
+  background: #808080;
+}
+.wym_dialog a.button.wym_cancel.close_dialog {
+  margin-left: 6px;
+}
+#content a.button.close_dialog:active {
+  color: white;
+}
+.form-actions a.confirm-delete, #content .form-actions a.confirm-delete {
+  background: #ee1100;
+  position: absolute;
+  right: 0px;
+}
+.form-actions a.confirm-delete:hover, #content .form-actions a.confirm-delete:hover {
+  background: #ff3322;
+}
+.form-actions a.confirm-delete:active, #content .form-actions a.confirm-delete:active {
+  background: #bb0000;
+}
+.field input[type=text], .field input[type=password], .field textarea {
+  border: 1px solid #7f9db9;
+  padding: 0.4% 0.5%;
+  line-height: 20px;
+}
+/* ## Advanced Page Options --------------------------------------------- */
+#more_options{
+  overflow:hidden;
+}
+.hemisquare {
+  padding: 10px;
+  margin: 0px 0px;
+  margin-left: 10px;
+  float: left;
+  width: 45%;
+}
+.hemisquare.right_side {
+	float: right;
+}
+#content .hemisquare h2 {
+  margin-top: 0px;
+}
+.hemisquare input, .hemisquare textarea, .hemisquare select {
+  margin: 7px 0px;
+}
+.hemisquare textarea {
+  margin-bottom: 0px;
+}
+.hemisquare label {
+  margin: 0px;
+}
+#content .hemisquare .field {
+  margin: 0 0 20px 0px;
+  width: 98%;
+}
+.hemisquare small {
+  font-size: 0.9em;
+}
+.label_with_help label, .label_with_help span.help {
+  display: inline;
+}
+.label_with_help span.help {
+  font-weight: normal;
+  margin-left: 3px;
+  border-bottom: 1px dotted #727272;
+  cursor: help;
+}
+#more_options_field {
+  position: relative;
+}
+#draft_field {
+	position: absolute;
+	right: 0px;
+	top: 0px;
+}
+.nothing_selected {
+  border-bottom: 1px dotted #727272;
+  width: auto;
+  margin-bottom: 12px;
+  display: inline-block;
+}
+.nothing_selected:hover {
+  border-bottom: 1px solid #727272;
+}
+#upgrade_wrapper li a {
+  line-height: 20px;
+}
+
+/* cornering */
+.button, #editor_switch a, #editor_switch span {
+  border-radius: 6px;
+  -moz-border-radius: 6px;
+  -webkit-border-radius: 6px;
+}
+#page_container, .wym_box {
+  border-radius-bottom: 5px;
+  -webkit-border-radius-bottom-left: 5px;
+  -webkit-border-radius-bottom-right: 5px;
+  -webkit-border-bottom-left-radius: 5px;
+  -webkit-border-bottom-right-radius: 5px;
+}
+.wym_iframe iframe {
+  border-radius-bottom: 2px;
+  -webkit-border-radius-bottom-left: 2px;
+  -webkit-border-radius-bottom-right: 2px;
+  -webkit-border-bottom-left-radius: 2px;
+  -webkit-border-bottom-right-radius: 2px;
+}
+.form-actions {
+  border-radius: 5px;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+}
+.form-actions.form-actions-dialog {
+  border-radius: 0px;
+  -moz-border-radius: 0px;
+  -webkit-border-radius: 0px;
+}
+#menu > a {
+  border-radius-top: 5px;
+  -moz-border-radius-topleft: 5px;
+  -moz-border-radius-topright: 5px;
+  -webkit-border-top-left-radius: 5px;
+  -webkit-border-top-right-radius: 5px;
+}
+.ui-tabs .ui-state-default a {
+  border-top-left-radius: 5px;
+  border-top-right-radius: 5px;
+  -moz-border-radius-topleft: 5px;
+  -moz-border-radius-topright: 5px;
+  -webkit-border-top-left-radius: 5px;
+  -webkit-border-top-right-radius: 5px;
+}
+.tooltip, .tooltip span {
+  border-radius: 6px;
+  -moz-border-radius: 6px;
+  -webkit-border-radius: 6px;
+}