Changeset 8681

Timestamp:

08/20/08 01:16:20 (3 months ago)

Author:

azaozz

Message:

The trunk media uploader back in.

Files:

• branches/crazyhorse/wp-admin/css/colors-classic.css (modified) (2 diffs)
• branches/crazyhorse/wp-admin/css/colors-fresh.css (modified) (3 diffs)
• branches/crazyhorse/wp-admin/css/media.css (modified) (10 diffs)
• branches/crazyhorse/wp-admin/edit-form-advanced.php (modified) (1 diff)
• branches/crazyhorse/wp-admin/edit-page-form.php (modified) (1 diff)
• branches/crazyhorse/wp-admin/js/media-upload.js (modified) (3 diffs)
• branches/crazyhorse/wp-admin/media-upload.php (modified) (1 diff)
• branches/crazyhorse/wp-admin/wp-admin.css (modified) (1 diff)
• branches/crazyhorse/wp-includes/general-template.php (modified) (1 diff)

branches/crazyhorse/wp-admin/css/colors-classic.css

@@ -309 +309 @@
-
-/* Because we don't want visited on these links */
-
+#sidemenu a.current, 
-    background-color: #fff;
-    border-color: #07273e;
@@ -730 +730 @@
-    background-color: #99ff99;
-}
+
+/* media popup 0819 */
+#sidemenu a {
+    background-color: #14568a;
+    border-bottom-color: #07273e;
+    border-top-color: #14568a;
+    color: #cfebf6;
+}

branches/crazyhorse/wp-admin/css/colors-fresh.css

@@ -295 +295 @@
-
-/* Because we don't want visited on these links */
-
+#sidemenu a.current, 
-    background-color: #fff;
-    border-color: #c6d9e9;
@@ -719 +719 @@
-}
-
-
-
-
-#adminmenu,
-#html-upload-ui,
-#att-info {
-    background-color: #E4F2FD;
@@ -763 +759 @@
-    color: #ccc;
-}
+
+/* media popup 0819 */
+#sidemenu a {
+    background-color: #e4f2fd;
+    border-bottom-color: #c6d9e9;
+    border-top-color: #e4f2fd;
+}

branches/crazyhorse/wp-admin/css/media.css

@@ -23 +23 @@
-
-form {
-2px
+1em
-}
-
@@ -32 +32 @@
-.media-upload-form label, .media-upload-form legend {
-    display:block;
-
+
+
-    margin-bottom: 0.5em;
-    margin: 0 0 0.5em 0;
@@ -59 +60 @@
-/* specific to the image upload form */
-.align .field label {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -179 +179 @@
-}
-.describe input[type="text"], .describe textarea {
-
-
-
-
+
-}
-.describe-toggle-on, .describe-toggle-off {
@@ -211 +208 @@
-
-#media-upload .media-upload-form p.ml-submit {
-
-
-
+
-}
-
-#media-upload p.help, #media-upload label.help {
-
-
-
-
+
+
-}
-#media-upload tr.image-size td.field {
@@ -226 +219 @@
-}
-#media-upload #media-items {
-
-
-
-
-
+
+
+
+
-}
-
@@ -253 +245 @@
-}
-#media-upload .describe {
+    border-top-width: 1px;
+    border-top-style: solid;
-    padding: 5px;
-    width: 100%;
@@ -259 +253 @@
-}
-#media-upload .describe th.label {
-
-
-
-
+
+
-}
-#media-upload tr.align td.field {
@@ -287 +279 @@
-}
-
+#media-upload a.delete,
+#media-upload a.del-link {
+    padding: 0 3px 1px;
+}
+
-#media-upload .del-attachment {
-    display: none;
@@ -325 +322 @@
-    z-index: -1;
-}
-
-#media-single-form .filename {
-    float: none;
-}
-
-.filelink {
-    float:left;
-    max-width:65px;
-    padding:6px;
-    text-align:center;
-}
-
-.filelink img.thumbnail {
-    width: 45px;
-    max-height: 45px;
-}
-
-#media-upload .filelink p.filelink-caption {
-    cursor:default;
-    font-size:10px;
-    height:13px;
-    margin:0pt 3px 4px;
-    overflow:hidden;
-}
-
-body#media-upload {
-    height: auto;
-}
-
-#media-upload .tablenav,
-#media-upload .page-numbers {
-    background-color: #fff;
-    border: 0 none;
-    color: #328AB2;
-    font-weight:normal;
-}
-
-#media-upload .page-numbers {
-    padding: 0;
-}
-
-#media-upload .tablenav {
-    margin: 0;
-    height:1em;
-    text-align:right;
-    padding: 4px 10px;
-}
-
-#media-upload .tablenav .tablenav-pages {
-    float: none;
-    height: 12px;
-    padding: 0;
-}
-
-#html-upload-ui {
-    margin:10px 5px;
-    padding:5px 0 5px 8px;
-}
-
-#html-upload-help {
-    font-size:10px;
-    font-weight:bold;
-    padding:4px 0 0 15px;
-}
-
-#async-upload {
-    font-size: 10px;
-}
-
-#html-upload-ui input {
-    padding: 1px;
-    font-size:10px;
-}
-
-#html-upload-ui a {
-    padding: 1px;
-    font-size:10px;
-}
-
-#att-info {
-    margin:10px 5px;
-    padding:4px;
-}
-
-#att-info a,
-#att-info p {
-    font-size: 11px;
-    text-decoration: none;
-}
-
-.button-link {
-    font-size: 11px;
-    padding: 2px;
-    border: 0;
-    background: transparent;
-}
-
-#media-upload  #att-info p {
-    margin:3px 6px 4px 2px;
-    padding:0pt 0pt 0pt 17px;
-    height:16px;
-}
-
-#media-upload  #att-info p.type-image {
-    background: url(../images/media-button-image.gif) no-repeat center left;
-}
-
-#media-upload  #att-info p.type-audio {
-    background: url(../images/media-button-music.gif) no-repeat center left;
-}
-
-#media-upload  #att-info p.type-video {
-    background: url(../images/media-button-video.gif) no-repeat center left;
-}
-
-#media-upload  #att-info p.type-file {
-    background: url(../images/media-button-other.gif) no-repeat center left;
-}
-
-#media-upload  #att-info p.type-single {
-    background: url(../images/media-button-other.gif) no-repeat center left;
-}
-
-.ml-submit .button {
-    font-size: 11px;
-    padding: 1px 2px 2px;
-}

branches/crazyhorse/wp-admin/edit-form-advanced.php

@@ -387 +387 @@
-<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
-
-ins=1
+type=image
-
-<h3><?php _e('Post') ?></h3>

branches/crazyhorse/wp-admin/edit-page-form.php

@@ -266 +266 @@
-<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
-
-ins=1
+type=image
-
-<h3><?php _e('Page') ?></h3>

branches/crazyhorse/wp-admin/js/media-upload.js

@@ -20 +20 @@
-    tb_position = function() {
-        var tbWindow = $('#TB_window');
-
-
-
-
+
+
+
-
-        if ( tbWindow.size() ) {
@@ -30 +29 @@
-            tbWindow.css({'margin-left': '-' + parseInt((( W - 50 ) / 2),10) + 'px'});
-            if ( typeof document.body.style.maxWidth != 'undefined' )
-margin-top': '-' + parseInt((( H - 10 ) / 2),10) + 'px
+top':'20px','margin-top':'0
-            $('#TB_title').css({'background-color':'#222','color':'#cfcfcf'});
-            $('#TB_ajaxWindowTitle').text('Add Media').css({'fontSize':'16px','fontWeight':'bold','paddingTop':'3px'});
-        };
-
@@ -51 +49 @@
-    });
-
-//
+
-});
-

branches/crazyhorse/wp-admin/media-upload.php

@@ -40 +40 @@
-    $tab = strval($_GET['tab']);
-else
-library
+type
-
-$body_id = 'media-upload';
-
-// let the action code decide how to handle the request
-isset($_POST['html-upload']) || 'single' == $tab
-imag
+$tab == 'type'
+$typ
-else
-library
+$tab
-
-?>

branches/crazyhorse/wp-admin/wp-admin.css

@@ -1878 +1878 @@
-    padding: 2px;
-}
+
+/* media popup 0819 */
+
+#sidemenu {
+    margin: -30px 15px 0 315px;
+    list-style: none;
+    position: relative;
+    float: right;
+    padding-left: 10px;
+    font-size:12px;
+}
+
+#sidemenu a {
+    padding: 0 7px;
+    display: block;
+    float: left;
+    line-height: 28px;
+    border-top-width: 1px;
+    border-top-style: solid;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+}
+
+#sidemenu li {
+    display: inline;
+    line-height: 200%;
+    list-style: none;
+    text-align: center;
+    white-space: nowrap;
+    margin: 0;
+    padding: 0;
+}
+
+#sidemenu a.current {
+    font-weight: normal;
+    padding-left: 6px;
+    padding-right: 6px;
+    -moz-border-radius-topleft: 4px;
+    -khtml-border-top-left-radius: 4px;
+    -webkit-border-top-left-radius: 4px;
+    border-top-left-radius: 4px;
+    -moz-border-radius-topright: 4px;
+    -khtml-border-top-right-radius: 4px;
+    -webkit-border-top-right-radius: 4px;
+    border-top-right-radius: 4px;
+    border-width: 1px;
+    border-style: solid;
+}
+
+#sidemenu {
+    margin: -30px 15px 0 315px;
+    list-style: none;
+    position: relative;
+    float: right;
+    padding-left: 10px;
+    font-size:12px;
+}
+
+#sidemenu a {
+    padding: 0 7px;
+    display: block;
+    float: left;
+    line-height: 28px;
+    border-top-width: 1px;
+    border-top-style: solid;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+}
+
+#sidemenu li a .count-0 {
+    display: none;
+}

branches/crazyhorse/wp-includes/general-template.php

@@ -970 +970 @@
-    }
-
-
+/*
-        <div id="media-buttons" class="hide-if-no-js">
-        <?php do_action( 'media_buttons' ); ?>
-        </div>
-
+*/ 
-    </div>
-