Ticket #21598: 21598-21c.diff
| File 21598-21c.diff, 14.8 KB (added by , 12 years ago) |
|---|
-
wp-load.php
57 57 $die = __( "There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started." ) . '</p>'; 58 58 $die .= '<p>' . __( "Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ) . '</p>'; 59 59 $die .= '<p>' . __( "You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file." ) . '</p>'; 60 $die .= '<p><a href="' . $path . '" class="button ">' . __( "Create a Configuration File" ) . '</a>';60 $die .= '<p><a href="' . $path . '" class="button button-large">' . __( "Create a Configuration File" ) . '</a>'; 61 61 62 62 wp_die( $die, __( 'WordPress › Error' ) ); 63 63 } -
wp-includes/functions.php
2126 2126 a:hover { 2127 2127 color: #D54E21; 2128 2128 } 2129 2130 2129 .button { 2131 font-family: sans-serif;2130 display: inline-block; 2132 2131 text-decoration: none; 2133 font-size: 14px !important; 2134 line-height: 16px; 2135 padding: 6px 12px; 2132 font-size: 14px; 2133 line-height: 23px; 2134 height: 24px; 2135 margin: 0; 2136 padding: 0 10px 1px; 2136 2137 cursor: pointer; 2137 border: 1px solid #bbb; 2138 color: #464646; 2139 -webkit-border-radius: 15px; 2140 border-radius: 15px; 2141 -moz-box-sizing: content-box; 2142 -webkit-box-sizing: content-box; 2143 box-sizing: content-box; 2144 background-color: #f5f5f5; 2145 background-image: -ms-linear-gradient(top, #ffffff, #f2f2f2); 2146 background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2); 2147 background-image: -o-linear-gradient(top, #ffffff, #f2f2f2); 2148 background-image: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#f2f2f2)); 2149 background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); 2150 background-image: linear-gradient(top, #ffffff, #f2f2f2); 2138 border-width: 1px; 2139 border-style: solid; 2140 -webkit-border-radius: 3px; 2141 border-radius: 3px; 2142 white-space: nowrap; 2143 -webkit-box-sizing: border-box; 2144 -moz-box-sizing: border-box; 2145 box-sizing: border-box; 2146 background: #f3f3f3; 2147 background-image: -webkit-gradient(linear, left top, left bottom, from(#fefefe), to(#f4f4f4)); 2148 background-image: -webkit-linear-gradient(top, #fefefe, #f4f4f4); 2149 background-image: -moz-linear-gradient(top, #fefefe, #f4f4f4); 2150 background-image: -o-linear-gradient(top, #fefefe, #f4f4f4); 2151 background-image: linear-gradient(to bottom, #fefefe, #f4f4f4); 2152 border-color: #bbb; 2153 color: #333; 2154 text-shadow: 0 1px 0 #fff; 2151 2155 } 2156 2157 .button.button-large { 2158 height: 29px; 2159 line-height: 28px; 2160 padding: 0 12px; 2161 } 2152 2162 2153 .button:hover { 2154 color: #000; 2155 border-color: #666; 2163 .button:hover, 2164 .button:focus { 2165 background: #f3f3f3; 2166 background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#f3f3f3)); 2167 background-image: -webkit-linear-gradient(top, #fff, #f3f3f3); 2168 background-image: -moz-linear-gradient(top, #fff, #f3f3f3); 2169 background-image: -ms-linear-gradient(top, #fff, #f3f3f3); 2170 background-image: -o-linear-gradient(top, #fff, #f3f3f3); 2171 background-image: linear-gradient(to bottom, #fff, #f3f3f3); 2172 border-color: #999; 2173 color: #222; 2156 2174 } 2175 2176 .button:focus { 2177 -webkit-box-shadow: 1px 1px 1px rgba(0,0,0,.2); 2178 box-shadow: 1px 1px 1px rgba(0,0,0,.2); 2179 } 2157 2180 2158 2181 .button:active { 2159 background-image: -ms-linear-gradient(top, #f2f2f2, #ffffff); 2160 background-image: -moz-linear-gradient(top, #f2f2f2, #ffffff); 2161 background-image: -o-linear-gradient(top, #f2f2f2, #ffffff); 2162 background-image: -webkit-gradient(linear, left top, left bottom, from(#f2f2f2), to(#ffffff)); 2163 background-image: -webkit-linear-gradient(top, #f2f2f2, #ffffff); 2164 background-image: linear-gradient(top, #f2f2f2, #ffffff); 2182 outline: none; 2183 background: #eee; 2184 background-image: -webkit-gradient(linear, left top, left bottom, from(#f4f4f4), to(#fefefe)); 2185 background-image: -webkit-linear-gradient(top, #f4f4f4, #fefefe); 2186 background-image: -moz-linear-gradient(top, #f4f4f4, #fefefe); 2187 background-image: -ms-linear-gradient(top, #f4f4f4, #fefefe); 2188 background-image: -o-linear-gradient(top, #f4f4f4, #fefefe); 2189 background-image: linear-gradient(to bottom, #f4f4f4, #fefefe); 2190 border-color: #999; 2191 color: #333; 2192 text-shadow: 0 -1px 0 #fff; 2193 -webkit-box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 ); 2194 box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 ); 2165 2195 } 2166 2196 2167 2197 <?php if ( 'rtl' == $text_direction ) : ?> -
wp-includes/css/buttons.css
39 39 .button-primary, 40 40 .button-secondary { 41 41 display: inline-block; 42 vertical-align: middle;43 42 text-decoration: none; 44 43 font-size: 12px; 45 line-height: 1.45em; 44 line-height: 23px; 45 height: 24px; 46 46 margin: 0; 47 padding: 3px 10px;47 padding: 0 10px 1px; 48 48 cursor: pointer; 49 49 border-width: 1px; 50 50 border-style: solid; … … 67 67 68 68 .button.button-large, 69 69 .button-group.button-large .button { 70 padding: 5px 12px; 70 height: 29px; 71 line-height: 28px; 72 padding: 0 12px; 71 73 } 72 74 73 75 .button.button-small, 74 76 .button-group.button-small .button { 75 padding: 2px 8px; 77 height: 21px; 78 line-height: 20px; 79 padding: 0 8px; 76 80 } 77 81 78 82 .button:active { -
wp-admin/css/install.css
70 70 text-align: left; 71 71 padding: 0; 72 72 } 73 74 .submit input, 75 .button, 76 .button-secondary { 77 font-family: sans-serif; 78 text-decoration: none; 79 font-size: 14px !important; 80 line-height: 16px; 81 padding: 6px 12px; 82 cursor: pointer; 83 border: 1px solid #bbb; 84 color: #464646; 85 -webkit-border-radius: 15px; 86 border-radius: 15px; 87 -webkit-box-sizing: content-box; 88 -moz-box-sizing: content-box; 89 box-sizing: content-box; 90 background: #f2f2f2; 91 background-image: -webkit-gradient(linear, left bottom, left top, from(#ededed), to(#fff)); 92 background-image: -webkit-linear-gradient(bottom, #ededed, #fff); 93 background-image: -moz-linear-gradient(bottom, #ededed, #fff); 94 background-image: -o-linear-gradient(bottom, #ededed, #fff); 95 background-image: linear-gradient(to top, #ededed, #fff); 73 .step .button-large { 74 font-size: 14px; 96 75 } 97 98 .button:hover,99 .button-secondary:hover,100 .submit input:hover {101 color: #000;102 border-color: #666;103 }104 105 .button:active,106 .submit input:active,107 .button-secondary:active {108 background: #eee;109 background-image: -webkit-gradient(linear, left top, left bottom, from(#ededed), to(#fff));110 background-image: -webkit-linear-gradient(top, #ededed, #fff);111 background-image: -moz-linear-gradient(top, #ededed, #fff);112 background-image: -o-linear-gradient(top, #ededed, #fff);113 background-image: linear-gradient(to bottom, #ededed, #fff);114 }115 116 76 textarea { 117 77 border: 1px solid #dfdfdf; 118 78 -webkit-border-radius: 3px; -
wp-admin/css/wp-admin.css
2262 2262 } 2263 2263 2264 2264 .welcome-panel .welcome-button { 2265 margin: -9px 0 3px; 2266 padding: 1em 3em; 2267 font: normal 15px/1 sans-serif; 2265 font: normal 15px sans-serif; 2266 height: 46px; 2267 line-height: 44px; 2268 margin: -9px 0 3px; 2269 padding: 0 36px; 2268 2270 } 2269 2271 2270 2272 .welcome-panel-content { -
wp-admin/setup-config.php
96 96 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 97 97 <title><?php _e( 'WordPress › Setup Configuration File' ); ?></title> 98 98 <link rel="stylesheet" href="css/install.css?ver=<?php echo preg_replace( '/[^0-9a-z\.-]/i', '', $wp_version ); ?>" type="text/css" /> 99 <link rel="stylesheet" href="../wp-includes/css/buttons.css?ver=<?php echo preg_replace( '/[^0-9a-z\.-]/i', '', $wp_version ); ?>" type="text/css" /> 99 100 100 101 </head> 101 102 <body<?php if ( is_rtl() ) echo ' class="rtl"'; ?>> … … 119 120 <p><strong><?php _e( "If for any reason this automatic file creation doesn’t work, don’t worry. All this does is fill in the database information to a configuration file. You may also simply open <code>wp-config-sample.php</code> in a text editor, fill in your information, and save it as <code>wp-config.php</code>." ); ?></strong></p> 120 121 <p><?php _e( "In all likelihood, these items were supplied to you by your Web Host. If you do not have this information, then you will need to contact them before you can continue. If you’re all ready…" ); ?></p> 121 122 122 <p class="step"><a href="setup-config.php?step=1<?php if ( isset( $_GET['noapi'] ) ) echo '&noapi'; ?>" class="button "><?php _e( 'Let’s go!' ); ?></a></p>123 <p class="step"><a href="setup-config.php?step=1<?php if ( isset( $_GET['noapi'] ) ) echo '&noapi'; ?>" class="button button-large"><?php _e( 'Let’s go!' ); ?></a></p> 123 124 <?php 124 125 break; 125 126 … … 156 157 </tr> 157 158 </table> 158 159 <?php if ( isset( $_GET['noapi'] ) ) { ?><input name="noapi" type="hidden" value="1" /><?php } ?> 159 <p class="step"><input name="submit" type="submit" value="<?php echo htmlspecialchars( __( 'Submit' ), ENT_QUOTES ); ?>" class="button " /></p>160 <p class="step"><input name="submit" type="submit" value="<?php echo htmlspecialchars( __( 'Submit' ), ENT_QUOTES ); ?>" class="button button-large" /></p> 160 161 </form> 161 162 <?php 162 163 break; … … 165 166 foreach ( array( 'dbname', 'uname', 'pwd', 'dbhost', 'prefix' ) as $key ) 166 167 $$key = trim( stripslashes( $_POST[ $key ] ) ); 167 168 168 $tryagain_link = '</p><p class="step"><a href="setup-config.php?step=1" onclick="javascript:history.go(-1);return false;" class="button ">' . __( 'Try again' ) . '</a>';169 $tryagain_link = '</p><p class="step"><a href="setup-config.php?step=1" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>'; 169 170 170 171 if ( empty( $prefix ) ) 171 172 wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) ); … … 264 265 } 265 266 ?></textarea> 266 267 <p><?php _e( 'After you’ve done that, click “Run the install.”' ); ?></p> 267 <p class="step"><a href="install.php" class="button "><?php _e( 'Run the install' ); ?></a></p>268 <p class="step"><a href="install.php" class="button button-large"><?php _e( 'Run the install' ); ?></a></p> 268 269 <script> 269 270 (function(){ 270 271 var el=document.getElementById('wp-config'); … … 284 285 ?> 285 286 <p><?php _e( "All right sparky! You’ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to…" ); ?></p> 286 287 287 <p class="step"><a href="install.php" class="button "><?php _e( 'Run the install' ); ?></a></p>288 <p class="step"><a href="install.php" class="button button-large"><?php _e( 'Run the install' ); ?></a></p> 288 289 <?php 289 290 endif; 290 291 break; -
wp-admin/install.php
58 58 <head> 59 59 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 60 60 <title><?php _e( 'WordPress › Installation' ); ?></title> 61 <?php wp_admin_css( 'install', true ); ?> 61 <?php 62 wp_admin_css( 'install', true ); 63 wp_admin_css( 'buttons', true ); 64 ?> 62 65 </head> 63 66 <body<?php if ( is_rtl() ) echo ' class="rtl"'; ?>> 64 67 <h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png?ver=20120216" /></h1> … … 134 137 <td colspan="2"><label><input type="checkbox" name="blog_public" value="1" <?php checked( $blog_public ); ?> /> <?php _e( 'Allow search engines to index this site.' ); ?></label></td> 135 138 </tr> 136 139 </table> 137 <p class="step"><input type="submit" name="Submit" value="<?php esc_attr_e( 'Install WordPress' ); ?>" class="button " /></p>140 <p class="step"><input type="submit" name="Submit" value="<?php esc_attr_e( 'Install WordPress' ); ?>" class="button button-large" /></p> 138 141 </form> 139 142 <?php 140 143 } // end display_setup_form() … … 142 145 // Let's check to make sure WP isn't already installed. 143 146 if ( is_blog_installed() ) { 144 147 display_header(); 145 die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p><p class="step"><a href="../wp-login.php" class="button ">' . __('Log In') . '</a></p></body></html>' );148 die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p><p class="step"><a href="../wp-login.php" class="button button-large">' . __( 'Log In' ) . '</a></p></body></html>' ); 146 149 } 147 150 148 151 $php_version = phpversion(); … … 241 244 </tr> 242 245 </table> 243 246 244 <p class="step"><a href="../wp-login.php" class="button "><?php _e( 'Log In' ); ?></a></p>247 <p class="step"><a href="../wp-login.php" class="button button-large"><?php _e( 'Log In' ); ?></a></p> 245 248 246 249 <?php 247 250 } -
wp-admin/maint/repair.php
16 16 <head> 17 17 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 18 18 <title><?php _e( 'WordPress › Database Repair' ); ?></title> 19 <?php wp_admin_css( 'install', true ); ?> 19 <?php 20 wp_admin_css( 'install', true ); 21 wp_admin_css( 'buttons', true ); 22 ?> 20 23 </head> 21 24 <body> 22 25 <h1 id="logo"><img alt="WordPress" src="../images/wordpress-logo.png?ver=20120216" /></h1> … … 102 105 else 103 106 echo '<p>' . __( 'WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.' ) . '</p>'; 104 107 ?> 105 <p class="step"><a class="button " href="repair.php?repair=1"><?php _e( 'Repair Database' ); ?></a></p>108 <p class="step"><a class="button button-large" href="repair.php?repair=1"><?php _e( 'Repair Database' ); ?></a></p> 106 109 <p><?php _e( 'WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing.' ); ?></p> 107 <p class="step"><a class="button " href="repair.php?repair=2"><?php _e( 'Repair and Optimize Database' ); ?></a></p>110 <p class="step"><a class="button button-large" href="repair.php?repair=2"><?php _e( 'Repair and Optimize Database' ); ?></a></p> 108 111 <?php 109 112 } 110 113 ?>