alchemy_cms 2.2.4 → 2.3.rc5

data/app/assets/stylesheets/alchemy/tables.css.scss

@@ -9,6 +9,13 @@ table {
 
   td, th {
     padding: $default-padding;
+    white-space: nowrap;
+    vertical-align: top;
+    line-height: 18px;
+
+    &.wrap-text {
+      white-space: normal !important;
+    }
   }
 
   th {
@@ -25,30 +32,74 @@ table tr td.tools {
   @include disable-user-select;
 }
 
-td.input, td.label {
-  padding-top: 2px;
+td.label, td.input, td.submit, td.select, td.value {
+  padding: 2px 0;
   vertical-align: top;
 }
 
-td.input, td.submit, td.select {
+td.input, td.submit, td.select, td.value {
   text-align: right;
-  padding-right: 0;
+
+  &.left {
+    text-align: left;
+  }
+}
+
+td.label {
+  white-space: nowrap;
+  width: 80px;
+  padding: 9px 2*$default-padding 0 0;
+  line-height: 21px;
+
+  &.mandatory:after {
+    content: '*';
+  }
+
+  &.long {
+    width: 140px;
+  }
+
+  &.middle {
+    padding-left: 2*$default-padding;
+  }
+
+  &.very_long {
+    width: 230px;
+  }
 }
 
 td.checkbox {
-  padding: 6px 4px;
+  padding-top: 10px;
+  text-align: right;
+  white-space: nowrap;
+
+  label {
+    @include inline-block;
+    text-align: left;
+    width: 194px;
+  }
+
+  &.long {
+    label {
+      width: 224px;
+    }
+  }
+
+  input[type="checkbox"] {
+    vertical-align: middle;
+    margin-top: 4px;
+  }
 }
 
 td.value {
-  text-align: right;
+  padding-top: 4px;
 
   p {
-    display: inline;
-    display: inline-block;
+    @include inline-block;
     width: 214px;
     text-align: left;
-    margin: 0;
-    line-height: 23px;
+    margin: $default-form-field-margin;
+    line-height: 25px;
   }
 
   &.long {
@@ -58,35 +109,12 @@ td.value {
   }
 }
 
-td.label {
-  white-space: nowrap;
-  width: 80px;
-  padding: $default-padding 2*$default-padding 0 0;
-  line-height: 6*$default-padding;
-}
-
-td.label.mandatory:after {
-  content: '*';
-}
-
 td.heading {
   padding: $default-padding 0;
   font-weight: bold;
   text-decoration: underline;
 }
 
-td.input input[type="checkbox"], td.input input[type="radio"] {
-  margin-top: 6px;
-}
-
-td.label.long {
-  width: 140px;
-}
-
-td.label.very_long {
-  width: 230px;
-}
-
 table tr td.tools a {
   width: 19px;
   height: 19px;
@@ -122,6 +150,7 @@ td.date {
 
 table td.right, table th.right {
   text-align: right;
+  padding-right: 0;
 }
 
 table td.center, table th.center {
@@ -137,8 +166,7 @@ td.email {
 }
 
 td.role {
-  width: 70px;
-  padding-right: 4px;
+  width: 10%;
 }
 
 table td.rights {
@@ -161,29 +189,7 @@ table tr.even td {
   background-color: white;
 }
 
-td.label.middle {
-  padding-left: 2*$default-padding;
-}
-
 th.icon, td.icon {
   background: none;
   display: table-cell;
 }
-
-td.checkbox {
-  text-align: right;
-  white-space: nowrap;
-
-  label {
-    display: inline;
-    display: inline-block;
-    text-align: left;
-    width: 194px;
-  }
-
-  &.long {
-    label {
-      width: 224px;
-    }
-  }
-}

data/app/assets/stylesheets/alchemy/tinymce_dialog.css.scss

@@ -3,28 +3,30 @@
 /* Generic */
 
 body {
-  font: 12px "Lucida Grande", Arial, sans-serif;
-  color: #333;
-  background: #ededed;
+  font: $default-font-style;
+  color: $text-color;
+  background-color: $light-gray;
   padding: 0;
-  margin: 8px 8px 0 8px;
+  margin: 2*$default-margin;
+  margin-bottom: 0;
 }
 
 html {
-  background: #ededed;
+  background: $light-gray;
 }
 
-textarea {
-  resize: none;
-  outline: none;
-}
+a {
+  color: $text-color;
+  text-decoration: none;
 
-a:link, a:visited {
-  color: black;
-}
+  &:hover {
+    text-decoration: underline;
+  }
 
-a:hover {
-  color: #2B6FB6;
+  &:focus {
+    @include default-focus-style(rgba(white, 0.5), none);
+    color: black;
+  }
 }
 
 .nowrap {
@@ -61,17 +63,13 @@ input.invalid {
   border: 1px solid #EE0000;
 }
 
-input {
-  background: #FFF;
-  border: 1px solid #CCC;
-}
-
-input, select, textarea {
-  font: 12px "Lucida Grande", Arial, sans-serif;
-}
-
-input, select, textarea {
-  border: 1px solid #808080;
+textarea {
+  @include default-input-style;
+  margin: 0;
+  resize: none;
+  outline: none;
+  padding: 4px !important;
+  line-height: 19px !important;
 }
 
 input.radio {
@@ -93,12 +91,7 @@ input.checkbox {
 /* Buttons */
 
 #insert, #cancel, input.button, .updateButton {
-  @include button-styles;
-  height: 26px;
-
-  &:hover {
-    @include button-hover-styles;
-  }
+  @include default-button-style;
 }
 
 /* Browse */
@@ -128,9 +121,7 @@ a.browse:hover span {
 
 a.browse span.disabled {
   border: 1px solid white;
-  opacity: 0.3;
-  -ms-filter: 'alpha(opacity=30)';
-  filter: alpha(opacity = 30)
+  @include opacity(0.3);
 }
 
 a.browse:hover span.disabled {
@@ -177,29 +168,33 @@ td.charmap, #charmap a {
   line-height: 18px;
 }
 
-#charmap a {
-  display: block;
-  color: #000;
-  text-decoration: none;
-  border: 0
-}
+#charmap {
+  margin: 4px 0;
 
-#charmap a:hover {
-  background: #CCC;
-  color: #2B6FB6
-}
+  a {
+    display: block;
+    color: $text-color;
+    text-decoration: none;
+    border: 0;
 
-#charmap #codeN {
-  font-size: 10px;
-  font-family: "Lucida Grande", Arial, sans-serif;
-  text-align: center
-}
+    &:hover {
+      background: #CCC;
+      color: #2B6FB6
+    }
+  }
 
-#charmap #codeV {
-  font-size: 40px;
-  height: 80px;
-  border: 1px solid #AAA;
-  text-align: center
+  #codeN {
+    font-size: 10px;
+    font-family: "Lucida Grande", Arial, sans-serif;
+    text-align: center
+  }
+
+  #codeV {
+    font-size: 40px;
+    height: 80px;
+    border: 1px solid #AAA;
+    text-align: center
+  }
 }
 
 /* Source */
@@ -211,7 +206,7 @@ td.charmap, #charmap a {
 }
 
 .mceActionPanel {
-  margin-top: 5px;
+  margin-top: 0px;
 }
 
 /* Tabs classes */
@@ -230,7 +225,7 @@ td.charmap, #charmap a {
 
 .tabs li {
   float: left;
-  background: image-url('alchemy/shading.png') repeat-x 0 0;
+  background: url('shading.png') repeat-x 0 0;
   margin: 0 2px 0 0;
   padding: 0 0 0 10px;
   line-height: 17px;
@@ -408,4 +403,9 @@ h3 {
 
 #colorpicker #colornamecontainer {
   margin-top: 5px;
-}
+}
+
+#iframecontainer iframe#iframe {
+  @include default-input-style;
+  padding: 0;
+}

data/app/assets/stylesheets/alchemy/upload.css.scss

@@ -33,7 +33,7 @@ a#uploadswitcher, a.underline {
 }
 
 #uploadProgressContainer .progressBarContainer {
-  background: #F9F9F9 image-url('alchemy/shading.png') repeat-x 0 0;
+  background: #F9F9F9 url('shading.png') repeat-x 0 0;
   border: 1px solid #9E9E9E;
   @include rounded-corner;
   height: 16px;
@@ -42,31 +42,31 @@ a#uploadswitcher, a.underline {
 }
 
 #uploadProgressContainer .progressBarInProgress {
-  background: #77AAD5 image-url('alchemy/shading.png') repeat-x 0 -75px;
+  background: #77AAD5 url('shading.png') repeat-x 0 -75px;
   height: 16px;
   width: 0;
 }
 
 #uploadProgressContainer .progressBarComplete {
-  background: #00D827 image-url('alchemy/shading.png') repeat-x 0 -75px;
+  background: #00D827 url('shading.png') repeat-x 0 -75px;
   height: 16px;
   width: 0;
 }
 
 #uploadProgressContainer .progressBarError {
-  background: #F00 image-url('alchemy/shading.png') repeat-x 0 -75px;
+  background: #F00 url('shading.png') repeat-x 0 -75px;
   height: 16px;
   width: 0;
 }
 
 #uploadProgressContainer .progressBarCanceled {
-  background: #E4E4E4 image-url('alchemy/shading.png') repeat-x 0 -75px;
+  background: #E4E4E4 url('shading.png') repeat-x 0 -75px;
   height: 16px;
   width: 0;
 }
 
 #uploadProgressContainer .progressCancel {
-  background: #f1f1f1 image-url('alchemy/icons.png') no-repeat -1px -72px;
+  background: #f1f1f1 url('icons.png') no-repeat -1px -72px;
   border: 1px solid #9e9e9e;
   @include rounded-corner;
   width: 15px;

data/app/assets/stylesheets/tiny_mce/plugins/inlinepopups/skins/alchemy/window.css.scss

@@ -46,7 +46,7 @@
   background: #888;
   top: 0;
   left: 0;
-  @include opacity(50);
+  @include opacity(0.5);
 }
 
 .alchemy_modalBlocker {
@@ -56,7 +56,7 @@
   width: 100%;
   height: 100%;
   background-color: #f4f4f4;
-  @include opacity(50);
+  @include opacity(0.5);
   display: none
 }
 
@@ -370,18 +370,14 @@ a.mceMove {
 /* Alert/Confirm */
 
 .alchemy .mceButton {
-  @include button-styles;
+  @include default-button-style;
   bottom: 10px;
-  width: 80px;
-  height: 25px;
-  line-height: 25px;
+  // width: 80px;
+  // height: 25px;
+  // line-height: 25px;
   vertical-align: middle;
   text-align: center;
   outline: 0;
-
-  &:hover {
-    @include button-hover-styles;
-  }
 }
 
 .alchemy .mceMiddle .mceIcon {

data/app/controllers/alchemy/admin/attachments_controller.rb

@@ -24,9 +24,10 @@ module Alchemy
       end
 
       def create
-        @attachment = Attachment.new(:uploaded_data => params[:Filedata])
-        @attachment.name = @attachment.filename
-        @attachment.save
+        @attachment = Attachment.create(
+          :uploaded_data => params[:Filedata],
+          :name => params[:Filedata].original_filename
+        )
         if in_overlay?
           @while_assigning = true
           @content = Content.find(params[:content_id], :select => 'id') if !params[:content_id].blank?
@@ -88,7 +89,7 @@ module Alchemy
         )
       end
 
-      private
+    private
 
       def in_overlay?
         !params[:content_id].blank?