Index: branches/5.1.x/core/admin_templates/incs/cms.css
===================================================================
diff -u -r12127 -r12657
--- branches/5.1.x/core/admin_templates/incs/cms.css	(.../cms.css)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/incs/cms.css	(.../cms.css)	(revision 12657)
@@ -16,7 +16,7 @@
 	padding: 5px;
 }
 
-div.cms-section-properties-btn, div.cms-edit-btn, div.cms-save-layout-btn {
+div.cms-section-properties-btn, div.cms-edit-btn, div.cms-edit-block-btn, div.cms-edit-design-btn {
 	padding: 2px 5px;
 	font-family: Arial, Verdana;
 	font-size: 13px;
@@ -26,19 +26,39 @@
 	color: black;
 	cursor: pointer;
 	-moz-border-radius: 10px;
+	z-index: 99;
+}
 
+div.cms-edit-btn, div.cms-edit-block-btn, div.cms-edit-design-btn {
 	margin-top: -10px;
-	z-index: 99;
 }
 
+div.cms-edit-design-btn-container {
+	position: absolute;
+	margin-left: -10px;
+	margin-top: -10px;
+	display: none;
+}
+
+div.cms-edit-design-btn-container div.cms-edit-block-btn, div.cms-edit-design-btn-container div.cms-edit-design-btn {
+	float: left;
+	display: block;
+	position: relative;
+	margin: 0px;
+}
+
+div.cms-edit-design-btn-container div.cms-edit-design-btn {
+	margin-left: 4px;
+}
+
 /* === Styles for "Section Properties" button === */
 div.cms-section-properties-btn {
 	float: right;
 	position: relative;
-
-	margin-right: -10px;
 	border: 2px solid #A1D0A1;
 	background-color: #CCFF00;
+	opacity: 0.5;
+	filter: alpha(opacity=50);
 }
 
 div.cms-section-properties-btn-container {
@@ -56,27 +76,73 @@
 	border: 2px solid #FF6E00;
 	background-color: #FFCC00;
 	opacity: 0.5;
+	filter: alpha(opacity=50);
 }
 
-/* === Styles for "Save Layout" button === */
-div.cms-save-layout-btn {
-	float: left;
-	position: absolute;
+div.cms-edit-block-btn {
+	margin-left: -10px;
+	border: 2px solid #FF6E00;
+	background-color: #FFCC00;
+	display: none;
+}
 
+div.cms-edit-design-btn {
 	margin-left: -10px;
 	border: 2px solid #A1D0A1;
 	background-color: #CCFF00;
+	display: none;
 }
 
+/* === Styles for "Save" and "Cancel" buttons (for layout) === */
+div.cms-layout-btn-container {
+	position: absolute;
+	display: none;
+	z-index: 99;
+}
+
+div.cms-save-layout-btn, div.cms-cancel-layout-btn {
+	float: left;
+	padding: 2px 5px;
+	font-family: Arial, Verdana;
+	font-size: 13px;
+	font-weight: normal;
+	width: auto;
+	color: black;
+	cursor: pointer;
+	/*opacity: 0.5;
+	filter: alpha(opacity=50);*/
+	-moz-border-radius: 10px;
+}
+
+div.cms-save-layout-btn {
+	color: white;
+	border: 2px solid #1C960C;
+	background-color: #24B30D;
+}
+
+div.cms-cancel-layout-btn {
+	color: white;
+	border: 2px solid #C81900;
+	background-color: #DE2A00;
+}
+
+div.cms-cancel-layout-btn {
+	margin-left: 4px;
+}
+
 /* === Styles for Template Editor === */
-div.block-edit-btn-container {
+div.block-edit-block-btn-container, div.block-edit-design-btn-container {
 	border: 1px dashed transparent;
 }
 
-div.block-edit-btn-container-over {
+div.block-edit-block-btn-container-over, div.block-edit-design-btn-container-over {
 	border-color: #FF6E00;
 }
 
+/*div.block-edit-design-btn-container-over {
+	border-color: #A1D0A1;
+}*/
+
 /* === Styles for element moving/sorting in theme === */
 div.movable-area {
 	min-height: 200px;
@@ -85,4 +151,26 @@
 .move-helper {
 	border: 3px dashed #666;
 	/*width: auto !important;*/
+}
+
+/* === Styles for phrase translation links === */
+span[name='cms-translate-phrase'] {
+	text-decoration: none;
+	border: 1px dashed transparent;
+	padding: 3px;
+
+}
+
+span[name='cms-translate-phrase']:hover {
+	border-color: #FF6E00;
+}
+
+span[name='cms-translate-phrase'] .cms-btn-text {
+	font-size: 9px;
+}
+
+span[name='cms-translate-phrase'] .cms-edit-btn {
+	display: none;
+	opacity: 1;
+	filter: alpha(opacity=100);
 }
\ No newline at end of file