Changeset 2101:4f5f79f9f0c9

Timestamp:

09/25/13 22:34:49 (12 years ago)

Author:

blr21

Branch:

ticket 1406

Children:

2102:fba83bbd6ee1, 2103:41e000221329

Message:

ticket 1406-1

Location:

admin

Files:

• js/_blog_theme.js (modified) (1 diff)
• js/_media_item.js (modified) (1 diff)
• js/_post.js (modified) (2 diffs)
• js/_preferences.js (modified) (1 diff)
• js/color-picker.js (modified) (1 diff)
• js/common.js (modified) (3 diffs)
• js/jsToolBar/jsToolBar.wysiwyg.js (modified) (1 diff)
• style/default.css (modified) (1 diff)

admin/js/_blog_theme.js

@@ -39 +39 @@
                if (submit_s.length > 0  && !$('input:radio',info).attr('disabled')) {
                     var select = $('<a href="#" class="button">' + dotclear.msg.use_this_theme + '</a>');
-                    select.css('font-weight','bold').click(function() {
+                    select.addClass('select-button').click(function(){
                          submit_s.click();
                          return false;

admin/js/_media_item.js

@@ -31 +31 @@
                          $(div).css({
                               overflow: 'auto',
-                              border: '1px solid #ccc',
                               margin: '1em 0',
                               padding: '1px 0.5em'
                          });
-                         
+                         $(div).addClass('color-div');
                          $(div).append(list);
                          self.before(div);

admin/js/_post.js

@@ -156 +156 @@
                          $(p).text(dotclear.msg.xhtml_valid);
                          $('#entry-content h3').after(p);
-                         $(p).backgroundFade({sColor:'#9BCA1C',eColor:'#bee74b',steps:20});
+                         $(p).backgroundFade({sColor: dotclear.fadeColor.beginValidatorMsg, eColor: dotclear.fadeColor.endValidatorMsg, steps: 50},function() {
+                                   $(this).backgroundFade({sColor: dotclear.fadeColor.endValidatorMsg, eColor: dotclear.fadeColor.beginValidatorMsg});
+                         });
                     } else {
                          var div = document.createElement('div');
@@ -164 +166 @@
                          $(div).html('<p><strong>' + dotclear.msg.xhtml_not_valid + '</strong></p>' + $(data).find('errors').text());
                          $('#entry-content h3').after(div);
-                         $(div).backgroundFade({sColor:'#ffdec8',eColor:'#ffbaba',steps:20});
-                    }
-                    
+                         $(div).backgroundFade({sColor: dotclear.fadeColor.beginValidatorErr, eColor: dotclear.fadeColor.endValidatorErr, steps: 50},function() {
+                                   $(this).backgroundFade({sColor: dotclear.fadeColor.endValidatorErr, eColor: dotclear.fadeColor.beginValidatorErr});     
+                         }
+
                     if ( $('#post_excerpt').text() != excerpt_content || $('#post_content').text() != post_content ) {
                          var pn = document.createElement('p');

admin/js/_preferences.js

@@ -13 +13 @@
           if ($('#user_email').val() != user_email || $('#new_pwd').val() != '') {
                e.focus();
-               $(e).backgroundFade({sColor:'#ffffff',eColor:'#ffbaba',steps:50},function() {
-                    $(this).backgroundFade({sColor:'#ffbaba',eColor:'#ffffff'});
+               $(e).backgroundFade({sColor: dotclear.fadeColor.beginUserMail, eColor: dotclear.fadeColor.endUserMail, steps: 50},function() {
+                    $(this).backgroundFade({sColor: dotclear.fadeColor.endUserMail, eColor: dotclear.fadeColor.beginUserMail});
                });
                return false;

admin/js/color-picker.js

@@ -13 +13 @@
                colbox.linkedto = null;
                
-               $(colbox).css({border: '1px solid #000', width: '195px', background: '#fff', position: 'absolute'});
-               $(colbox).css({display: 'none'});
+               $(colbox).addClass('color-color-picker');
+               $(colbox).css({display: 'none', position: 'absolute'});
                $('body').append(colbox);
           }

admin/js/common.js

@@ -354 +354 @@
                return true;
           });
-     }
-};
+     },
+     getCSSColor : function ( clazz) {
+          $('<div class="'+clazz+'" id="dotclear-obj-test-color" style="display:none"></div>').appendTo(document.body);
+          var tag2 = $('#dotclear-obj-test-color');
+          var color = $.trim(tag2.css("color").toLowerCase());
+          tag2.remove();
+          if ( color.charAt(0) === '#') {
+               return color;
+          }
+          var result = /^rgb\((\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\)$/.exec(color);       
+          if ( result === null) {
+               return '';
+          }
+          var ret = '#';
+          for ( var i = 1; i < 4; i++) {
+               var val = parseInt(result[i],10);
+               ret += (val < 16 ? '0'+val.toString(16) : val.toString(16));
+          }
+          return ret;
+     },
+     initFadeColor : function() {
+          dotclear.fadeColor = {
+               beginPassword : dotclear.getCSSColor('colorBeginPassword'),
+               endPassword : dotclear.getCSSColor('colorEndPassword'),
+               beginMessage : dotclear.getCSSColor('colorBeginMessage'),
+               endMessage : dotclear.getCSSColor('colorEndMessage'),
+               beginError : dotclear.getCSSColor('colorBeginError'),
+               endError : dotclear.getCSSColor('colorEndError'),
+               beginSuccess : dotclear.getCSSColor('colorBeginSuccess'),
+               endSuccess : dotclear.getCSSColor('colorEndSuccess'),
+               beginValidatorMsg : dotclear.getCSSColor('colorBeginValidatorMsg'),
+               endValidatorMsg : dotclear.getCSSColor('colorEndValidatorMsg'),
+               beginValidatorErr : dotclear.getCSSColor('colorBeginValidatorErr'),
+               endValidatorErr : dotclear.getCSSColor('colorEndValidatorErr'),
+               beginUserMail : dotclear.getCSSColor('colorBeginUserMail'),
+               endUserMail : dotclear.getCSSColor('colorEndUserMail')
+          };
+     }};
 
 /* On document ready
 -------------------------------------------------------- */
 $(function() {
+     dotclear.initFadeColor();
      // remove class no-js from html tag; cf style/default.css for examples
      $('body').removeClass('no-js').addClass('with-js');
@@ -395 +432 @@
      $('#help').helpViewer();
 
-     $('.message').backgroundFade({sColor:'#cccccc',eColor:'#676e78',steps:20});
-     $('.error').backgroundFade({sColor:'#ffdec8',eColor:'#ffbaba',steps:20});
-     $('.success').backgroundFade({sColor:'#9BCA1C',eColor:'#bee74b',steps:20});
+     $('.message').backgroundFade({sColor: dotclear.fadeColor.beginMessage, eColor: dotclear.fadeColor.endMessage, steps:20});
+     $('.error').backgroundFade({sColor: dotclear.fadeColor.beginError, eColor: dotclear.fadeColor.endError, steps:20});
+     $('.success').backgroundFade({sColor: dotclear.fadeColor.beginSuccess, eColor: dotclear.fadeColor.endSuccess, steps:20});
 
      $('form:has(input[type=password][name=your_pwd])').submit(function() {
@@ -403 +440 @@
           if (e.value == '') {
                e.focus();
-               $(e).backgroundFade({sColor:'#ffffff',eColor:'#ffbaba',steps:50},function() {
-                    $(this).backgroundFade({sColor:'#ffbaba',eColor:'#ffffff'});
+               $(e).backgroundFade({sColor: dotclear.fadeColor.beginPassword,eColor: dotclear.fadeColor.endPassword,steps:50},function() {
+                    $(this).backgroundFade({sColor: dotclear.fadeColor.endPassword,eColor: dotclear.fadeColor.beginPassword});
                });
                return false;

admin/js/jsToolBar/jsToolBar.wysiwyg.js

@@ -86 +86 @@
                     IErange.select();
                }
-          } else if (window.navigator.product != undefined && 
-                                    window.navigator.product == 'Gecko') {
-               This.ibody.innerHTML = '<p><br _moz_editor_blogus_node="TRUE" _moz_dirty=""/></p>';
           } else {
                var idoc = This.iwin.document;

admin/style/default.css

@@ -2505 +2505 @@
           }
      }
+     
+/* color-picker.js */
+.color-color-picker {
+     border: 1px solid #000;
+     width: 195px;
+     background: #fff;
+}
+
+/* _blog_theme.js */
+.select-button {
+     font-weight: bold;
+}
+
+/* _media_item.js */
+.color-div {
+     border: 1px solid #ccc;
+}
+
+/* common.js */
+.colorBeginPassword {
+     color: #fff;
+}
+.colorEndPassword {
+     color: #ffbaba;
+}
+.colorBeginMessage {
+     color: #ccc;
+}
+.colorEndMessage {
+     color: #676e78;
+}
+.colorBeginError {
+     color: #ffdec8;
+}
+.colorEndError {
+     color: #ffbaba;
+}
+.colorBeginSuccess {
+     color: #9BCA1C;
+}
+.colorEndSuccess {
+     color: #bee74b;
+}
+/* _post.js */
+.colorBeginValidatorMsg {
+     color: #676e78;
+}
+.colorEndValidatorMsg {
+     color: #ffcc00;
+}
+.colorBeginValidatorErr {
+     color: #fff;
+}
+.colorEndValidatorErr {
+     color: #ffbaba;
+}
+/* _preferences.js */
+.colorBeginUserMail {
+     color: #fff;
+}
+.colorEndUserMail {
+     color: #ffbaba;
+}
+