Merge branch 'stable'

Antonio Terceiro
2 parents f807fd58 52b58187
Showing 6 changed files with 35 additions and 45 deletions Show diff stats
app/models/location_block.rb
public/designs/templates/leftbar/stylesheets/style.css
public/designs/templates/rightbar/stylesheets/style.css
public/designs/themes/base/style.css
public/stylesheets/application.css
public/stylesheets/tinymce.css
@@ -19,7 +19,7 @@ class LocationBlock &lt; Block
       content_tag('div',
       '<img src="http://maps.google.com/staticmap?center=' + profile.lat.to_s() +
       ',' + profile.lng.to_s() + '&zoom=' + zoom.to_s() +
-      '&size=205x250&maptype=' + map_type + '&markers=' + profile.lat.to_s() + ',' +
+      '&size=190x250&maptype=' + map_type + '&markers=' + profile.lat.to_s() + ',' +
       profile.lng.to_s() + ',green&key=' + GoogleMaps::key(profile.default_hostname) + '&sensor=false"/>',
       :class => 'the-localization-map' )
     else
-
-#boxes {
-  /* none */
-}
-
 .box-1 {
-  margin: 0px 30px 0px 260px;
+  margin: 0 0 0 200px;
 }
+
 .box-1 .blocks {
   width: 100%;
   float: left;
@@ -13,20 +9,11 @@
 .box-2 {
   float: left;
-  width: 230px;
+  width: 190px;
 }
 .block {
   position: relative;
-  padding: 10px 0px;
+  padding: 10px 0;
   float: none;
 }
-
-#article-actions {
-  margin-right: 130px;
-}
-
-#article-actions {
-  margin-right: 130px;
-}
-
-
-#boxes {
-  /* none */
-}
-
 .box-1 {
-  margin: 0px 260px 0px 30px;
+  margin: 0 200px 0 0;
 }
+
 .box-1 .blocks {
   width: 100%;
   float: right;
@@ -13,12 +9,11 @@
 .box-2 {
   float: right;
-  width: 230px;
+  width: 190px;
 }
 .block {
   position: relative;
-  padding: 10px 0px;
+  padding: 10px 0;
   float: none;
 }
-
@@ -269,7 +269,6 @@ body, th, td, input {
 #content .main-block h1, #not-found h1, #access-denied h1 {
   font-variant: small-caps;
   color: #555753;
-  font-size: 16px;
   text-align: left;
   border-bottom: 2px solid #2e3436;
 }
@@ -776,7 +775,6 @@ X.sep {
 #content .no-boxes h1 {
   font-variant: small-caps;
   color: #555753;
-  font-size: 18px;
   text-align: left;
   border-bottom: 2px solid #2e3436; /*8C0*/
 }
@@ -158,11 +158,11 @@ div#notice {
   margin: 10px 0px;
   /*color: #2A5896;*/
 }
-#content h1 { font-size: 24px }
-#content h2 { font-size: 20px }
-#content h3 { font-size: 18px }
-#content h4 { font-size: 16px }
-#content h5 { font-size: 14px }
+#content h1 { font-size: 20px }
+#content h2 { font-size: 18px }
+#content h3 { font-size: 16px }
+#content h4 { font-size: 14px }
+#content h5 { font-size: 13px }
 #content h6 { font-size: 12px }
 #content .block-title {
@@ -589,9 +589,6 @@ code input {
   list-style: none;
   margin-bottom: 5px;
 }
-#online-doc-navigation h1 {
-  font-size: 16px;
-}
 #online-doc-navigation h1, #online-doc h1 {
   text-align: left;
@@ -2047,8 +2044,8 @@ div#activation_enterprise div {
 .the-localization-map {
   overflow: hidden;
   margin: auto;
-  max-width: 205px;
-  padding: 3px;
+  max-width: 190px;
+  padding: 0px;
   background: #FFF;
   border: 1px solid #888;
 }
@@ -2553,10 +2550,10 @@ div#activation_enterprise div {
 .controller-cms #media-listing-iframe {
   float: right;
-  width: 40%;
+  width: 380px;
   height: 630px;
   border: none;
-  margin: 104px 20px 0px 0px;
+  margin-top: 104px;
   padding: 0px;
   overflow: hidden;
 }
@@ -2567,6 +2564,7 @@ div#activation_enterprise div {
 .controller-cms div.with_media_panel {
   float: left;
+  width: 500px;
 }
 div.with_media_panel .formfield input {
@@ -2717,7 +2715,7 @@ div.event-info div.event-description {
 }
 div#article-parent {
-  margin-bottom: 5px;
+  margin: 5px 0px;
   text-align: right;
   font-style: italic;
 }
@@ -3019,11 +3017,12 @@ h1#agenda-title {
 }
 .no-boxes {
-  margin: 0px 200px 0px 200px;
+  margin: 0px;
 }
-.controller-search .no-boxes {
-  margin: 0px;
+.controller-content_viewer .no-boxes,
+.controller-profile .no-boxes {
+  margin: 0px 200px;
 }
 .controller-profile #content .no-boxes h1,
@@ -14,3 +14,14 @@ object, embed {
   height: 150px;
   background-image: url(../designs/icons/tango/Tango/22x22/actions/media-playback-start.png);
 }
+
+body.mceContentBody h2 { font-size: 18px }
+body.mceContentBody h3 { font-size: 16px }
+body.mceContentBody h4 { font-size: 14px }
+body.mceContentBody h5 { font-size: 13px }
+body.mceContentBody h6 { font-size: 12px }
+
+body.mceContentBody h1, body.mceContentBody h2, body.mceContentBody h3,
+body.mceContentBody h4, body.mceContentBody h5, body.mceContentBody h6 {
+  margin: 10px 0px;
+}
	@@ -19,7 +19,7 @@ class LocationBlock < Block		@@ -19,7 +19,7 @@ class LocationBlock < Block
19	content_tag('div',	19	content_tag('div',
20	'<img src="http://maps.google.com/staticmap?center=' + profile.lat.to_s() +	20	'<img src="http://maps.google.com/staticmap?center=' + profile.lat.to_s() +
21	',' + profile.lng.to_s() + '&zoom=' + zoom.to_s() +	21	',' + profile.lng.to_s() + '&zoom=' + zoom.to_s() +
22	- '&size=205x250&maptype=' + map_type + '&markers=' + profile.lat.to_s() + ',' +	22	+ '&size=190x250&maptype=' + map_type + '&markers=' + profile.lat.to_s() + ',' +
23	profile.lng.to_s() + ',green&key=' + GoogleMaps::key(profile.default_hostname) + '&sensor=false"/>',	23	profile.lng.to_s() + ',green&key=' + GoogleMaps::key(profile.default_hostname) + '&sensor=false"/>',
24	:class => 'the-localization-map' )	24	:class => 'the-localization-map' )
25	else	25	else
	@@ -14,3 +14,14 @@ object, embed {		@@ -14,3 +14,14 @@ object, embed {
14	height: 150px;	14	height: 150px;
15	background-image: url(../designs/icons/tango/Tango/22x22/actions/media-playback-start.png);	15	background-image: url(../designs/icons/tango/Tango/22x22/actions/media-playback-start.png);
16	}	16	}
		17	+
		18	+body.mceContentBody h2 { font-size: 18px }
		19	+body.mceContentBody h3 { font-size: 16px }
		20	+body.mceContentBody h4 { font-size: 14px }
		21	+body.mceContentBody h5 { font-size: 13px }
		22	+body.mceContentBody h6 { font-size: 12px }
		23	+
		24	+body.mceContentBody h1, body.mceContentBody h2, body.mceContentBody h3,
		25	+body.mceContentBody h4, body.mceContentBody h5, body.mceContentBody h6 {
		26	+ margin: 10px 0px;
		27	+}