Changeset 536:535dd04130aa
- Timestamp:
- 07/09/11 19:47:57 (14 years ago)
- Branch:
- default
- Files:
-
- 17 edited
-
admin/auth.php (modified) (1 diff)
-
admin/index.php (modified) (2 diffs)
-
admin/js/jquery/jquery.candyUpload.js (modified) (2 diffs)
-
admin/media.php (modified) (2 diffs)
-
admin/permissions.php (modified) (1 diff)
-
admin/post.php (modified) (4 diffs)
-
admin/preferences.php (modified) (1 diff)
-
admin/style/add.png (modified) (previous)
-
admin/style/candyUpload/style.css (modified) (7 diffs)
-
admin/style/default.css (modified) (4 diffs)
-
admin/user.php (modified) (1 diff)
-
plugins/akismet/class.dc.filter.akismet.php (modified) (1 diff)
-
plugins/antispam/filters/class.dc.filter.ip.php (modified) (4 diffs)
-
plugins/antispam/filters/class.dc.filter.iplookup.php (modified) (1 diff)
-
plugins/antispam/filters/class.dc.filter.words.php (modified) (4 diffs)
-
plugins/antispam/index.php (modified) (7 diffs)
-
plugins/pages/page.php (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
admin/auth.php
r473 r536 379 379 '</p>'; 380 380 } 381 else { 382 echo '<legend>'.__('Connection').'</legend>'; 383 } 384 381 385 echo 382 386 '<p><label for="user_id">'.__('Username:').' '. -
admin/index.php
r510 r536 313 313 '<h3>'.__('Quick entry').'</h3>'. 314 314 '<form id="quick-entry" action="post.php" method="post">'. 315 '<fieldset> '.315 '<fieldset><legend>'.__('New entry').'</legend>'. 316 316 '<p class="col"><label for="post_title" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:'). 317 317 form::field('post_title',20,255,'','maximal'). … … 325 325 '<p><input type="submit" value="'.__('Save').'" name="save" /> '. 326 326 ($core->auth->check('publish',$core->blog->id) 327 ? '<input type="hidden" value="'.__(' save and publish').'" name="save-publish" />'327 ? '<input type="hidden" value="'.__('Save and publish').'" name="save-publish" />' 328 328 : ''). 329 329 $core->formNonce(). -
admin/js/jquery/jquery.candyUpload.js
r3 r536 501 501 502 502 var size = this.formatSize(upldr.params.file_size_limit); 503 $('< div class="cu-maxsize">' + this.locales.max_file_size + ' ' + size + '</div>').appendTo(this.ctrl.block);503 $('<p class="cu-maxsize form-note info">' + this.locales.max_file_size + ' ' + size + '</p>').appendTo(this.ctrl.block); 504 504 }, 505 505 … … 553 553 '<div class="cu-fileinfo"><span class="cu-filename">' + o.name + '</span> ' + 554 554 '<span class="cu-filesize">(' + this.formatSize(o.size) + ')</span> ' + 555 '<span class="cu-filecancel"><a href="#">cancel</a> </span> ' +555 '<span class="cu-filecancel"><a href="#">cancel</a> </span> ' + 556 556 '<span class="cu-filemsg"></span>' + 557 557 '</div>'); -
admin/media.php
r505 r536 344 344 345 345 echo 346 '<div class="col"><h3 id="add-file">'.__('Add files').'</h3>'. 346 '<div class="col">'. 347 '<fieldset id="add-file-f"><legend>'.__('Add files').'</legend>'. 347 348 '<p>'.__('Please take care to publish media that you own and that are not protected by copyright.').'</p>'. 348 349 '<form id="media-upload" class="clear" action="'.html::escapeURL($page_url).'" method="post" enctype="multipart/form-data">'. 349 350 '<div>'.form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE). 350 351 $core->formNonce().'</div>'. 351 '<fieldset id="add-file-f">'.352 352 '<p><label for="upfile">'.__('Choose a file:'). 353 353 ' ('.sprintf(__('Maximum size %s'),files::size(DC_MAX_UPLOAD_SIZE)).')'. … … 366 366 367 367 echo 368 '<div class="col"> <h3 id="new-dir">'.__('New directory').'</h3>'.368 '<div class="col">'. 369 369 '<form class="clear" action="'.html::escapeURL($page_url).'" method="post">'. 370 370 '<fieldset id="new-dir-f">'. 371 '<legend>'.__('New directory').'</legend>'. 371 372 $core->formNonce(). 372 373 '<p><label for="newdir">'.__('Directory Name:'). -
admin/permissions.php
r500 r536 143 143 144 144 echo 145 '<fieldset> '.145 '<fieldset><legend>'.__('Validate permissions').'</legend>'. 146 146 '<p><label for="your_pwd">'.__('Your password:'). 147 147 form::password('your_pwd',20,255).'</label></p>'. -
admin/post.php
r500 r536 361 361 echo '<form action="post.php" method="post" id="entry-form">'; 362 362 echo '<div id="entry-wrapper">'; 363 echo '<div id="entry-content">< fieldsetclass="constrained">';363 echo '<div id="entry-content"><div class="constrained">'; 364 364 365 365 echo … … 393 393 '</p>'; 394 394 395 echo '</ fieldset></div>'; // End #entry-content395 echo '</div></div>'; // End #entry-content 396 396 echo '</div>'; // End #entry-wrapper 397 397 … … 538 538 539 539 '<form action="comment.php" method="post" id="comment-form">'. 540 '< fieldsetclass="constrained">'.540 '<div class="constrained">'. 541 541 '<p><label for="comment_author" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Name:'). 542 542 form::field('comment_author',30,255,html::escapeHTML($core->auth->getInfo('user_cn'))). … … 559 559 $core->formNonce(). 560 560 '<input type="submit" name="add" value="'.__('Save').'" /></p>'. 561 '</ fieldset>'.561 '</div>'. 562 562 '</form>'. 563 563 '</div>'; -
admin/preferences.php
r500 r536 387 387 '</fieldset>'. 388 388 389 '<fieldset>'. 390 '<p>'.__('If you want to change your email or password you must provide your current password.').'</p>'. 389 '<p>'.__('If you have changed this user email or password you must provide your current password to save these modifications.').'</p>'. 391 390 '<p><label for="cur_pwd">'.__('Your password:'). 392 form::password('cur_pwd',20,255).'</label></p>'. 393 '</fieldset>'; 391 form::password('cur_pwd',20,255).'</label></p>'; 394 392 } 395 393 -
admin/style/candyUpload/style.css
r3 r536 1 1 2 div.cu-ctrl {2 .cu-ctrl { 3 3 background: #f5f5f5; 4 padding: 5px0 0 0;4 padding: .5em 0 0 0; 5 5 margin: 0 0 1em 0; 6 6 overflow: hidden; 7 border-color: #ccc;8 border-width: 1px 0;9 border-style: solid;10 7 } 11 12 div.cu-msg { 13 padding: 0 0.5em; 8 .cu-msg { 14 9 font-weight: bold; 15 10 } 16 div.cu-msg.cu-error {11 .cu-msg.cu-error { 17 12 color: #c00; 18 13 } 19 20 div.cu-files { 14 .cu-files { 21 15 padding: 0 0.5em; 22 16 margin: 10px 0; 23 17 } 24 div.cu-file {18 .cu-file { 25 19 margin: 0 0 8px 0; 26 20 position: relative; 27 21 } 28 div.cu-fileinfo {22 .cu-fileinfo { 29 23 margin-left: 16px; 30 24 } 31 div.cu-fileinfo span.cu-filecancel {25 .cu-fileinfo span.cu-filecancel { 32 26 display: block; 33 27 position: absolute; … … 36 30 left: -16px; 37 31 } 38 div.cu-files span.cu-filecancel a {32 .cu-filecancel a { 39 33 display: block; 40 34 width: 12px; … … 45 39 outline: none; 46 40 } 47 div.cu-files span.cu-filemsg {41 .cu-filemsg { 48 42 font-weight: bold; 49 43 color: green; 50 44 } 51 div.cu-filesspan.cu-filemsg.cu-error {45 span.cu-filemsg.cu-error { 52 46 color: #c00; 53 47 } 54 55 div.cu-progress { 48 .cu-progress { 56 49 margin-left: 16px; 57 50 } 58 div.cu-progress div {51 .cu-progress div { 59 52 height: 10px; 60 53 width: 0; … … 69 62 -moz-border-radius: 2px; 70 63 } 71 72 div.cu-btn { 64 .cu-btn { 73 65 padding: 0 0.5em; 74 66 line-height: 1.2em; … … 77 69 position: relative; 78 70 } 79 div.cu-btn span {71 .cu-btn span { 80 72 display: block; 81 margin: 0 0 0 .5em;73 margin: 0 1em 0 0; 82 74 float: right; 83 75 } 84 div.cu-btn span a {76 .cu-btn span a { 85 77 display: block; 86 78 padding: .3em 1.5em; 87 79 } 88 div.cu-btnspan.cu-btn-browse {80 span.cu-btn-browse { 89 81 float: none; 90 82 position: absolute; 91 left: 0 .5em;83 left: 0; 92 84 margin: 0; 93 85 } 94 div.cu-btn span.cu-btn-upload a.button { 86 span.cu-btn-upload, span.cu-btn-clean { 87 margin-right: 0; 88 } 89 span.cu-btn-upload a.button { 95 90 color: #fff; 96 91 border: 1px solid #2373A8; … … 99 94 background: -moz-linear-gradient(top, #2C8FD1, #2373A8); 100 95 } 101 div.cu-btn span.cu-btn-upload a.button:hover, div.cu-btn span.cu-btn-upload a.button:focus { 96 span.cu-btn-upload a.button:hover, 97 span.cu-btn-upload a.button:focus { 102 98 color: #fff; 103 99 border: 1px solid #2C8FD1; … … 107 103 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#2373A8', endColorstr='#2C8FD1'); 108 104 } 109 div.cu-maxsize {105 .cu-maxsize.form-note { 110 106 clear: both; 111 margin: .75em 0 0 0.5em;107 margin: 1.5em 0 0; 112 108 font-style: italic; 113 109 } 114 115 div.cu-disable { 110 .cu-disable { 116 111 margin: 1em 0; 117 112 padding: 0 0 0.5em 0.5em; -
admin/style/default.css
r530 r536 1010 1010 background: #ddd; 1011 1011 } 1012 caption { 1013 color: #333; 1014 font-size: 1.2em; 1015 font-weight: bold; 1016 text-align: left; 1017 margin-bottom: .5em; 1018 } 1019 1012 1020 th, td { 1013 1021 border-width: 0 0 1px 0; … … 1079 1087 padding: 0; 1080 1088 } 1081 fieldset {1089 fieldset, .fieldset { 1082 1090 display: block; 1083 1091 margin: 0 0 1em 0; … … 1208 1216 padding-left: 20px; 1209 1217 } 1210 fieldset.constrained {1218 .constrained { 1211 1219 margin: 0; 1212 1220 padding: 0; … … 1319 1327 border-radius: .5em; 1320 1328 margin-bottom: .1em; 1321 background: #2C8FD1 url(add.png) no-repeat .2emcenter;1329 background: #2C8FD1 url(add.png) no-repeat 6px center; 1322 1330 color: #fff; 1323 padding: . 1em 1em .2em 28px;1331 padding: .2em 12px .2em 24px; 1324 1332 border: 1px solid #2373A8; 1325 1333 } -
admin/user.php
r501 r536 273 273 274 274 echo 275 '<fieldset>'.276 275 '<p><label for="your_pwd" '.($user_id != '' ? '' : 'class="required"').'>'. 277 276 ($user_id != '' ? '' : '<abbr title="'.__('Required field').'">*</abbr> ').__('Your password:'). 278 277 form::password('your_pwd',20,255).'</label></p>'. 279 '</fieldset>'.280 278 '<p class="clear"><input type="submit" accesskey="s" value="'.__('Save').'" />'. 281 279 ($user_id != '' ? form::hidden('id',$user_id) : ''). -
plugins/akismet/class.dc.filter.akismet.php
r270 r536 136 136 137 137 $res = 138 '<form action="'.html::escapeURL($url).'" method="post" >'.138 '<form action="'.html::escapeURL($url).'" method="post" class="fieldset">'. 139 139 '<p><label for="ak_key" class="classic">'.__('Akismet API key:').' '. 140 140 form::field('ak_key',12,128,$ak_key).'</label>'; -
plugins/antispam/filters/class.dc.filter.ip.php
r270 r536 123 123 '<div class="multi-part" id="tab_'.$type.'" title="'.$title.'">'. 124 124 125 '<form action="'.html::escapeURL($url).'" method="post">'. 126 '<fieldset><legend>'.__('Add an IP address').'</legend><p>'. 125 '<form action="'.html::escapeURL($url).'" method="post" class="fieldset">'. 127 126 form::hidden(array('ip_type'),$type). 128 '<label class="classic" for="addip_'.$type.'">'.__('Add an IP address ').' '.127 '<label class="classic" for="addip_'.$type.'">'.__('Add an IP address: ').' '. 129 128 form::field(array('addip', 'addip_'.$type),18,255). 130 129 '</label>'; … … 136 135 $res .= 137 136 $core->formNonce(). 138 '<input type="submit" value="'.__('Add').'"/></p>'. 139 '</fieldset></form>'; 137 '</p>'. 138 '<p><input type="submit" value="'.__('Add').'"/></p>'. 139 '</form>'; 140 140 141 141 $rs = $this->getRules($type); … … 149 149 $res .= 150 150 '<form action="'.html::escapeURL($url).'" method="post">'. 151 '< fieldset><legend>' . __('IP list') . '</legend>'.151 '<h3>' . __('IP list') . '</h3>'. 152 152 '<div style="'.$this->style_list.'">'; 153 153 … … 178 178 form::hidden(array('ip_type'),$type). 179 179 '</p>'. 180 '</f ieldset></form>';180 '</form>'; 181 181 } 182 182 -
plugins/antispam/filters/class.dc.filter.iplookup.php
r270 r536 86 86 '<p><label for="bls">'.__('Add here a coma separated list of servers.'). 87 87 form::textarea('bls',40,3,html::escapeHTML($bls),'maximal'). 88 '<input type="submit" value="'.__('Save').'" /></label></p>'. 88 '</p>'. 89 '<p><input type="submit" value="'.__('Save').'" /></label></p>'. 89 90 $this->core->formNonce().'</p>'. 90 91 '</fieldset>'. -
plugins/antispam/filters/class.dc.filter.words.php
r270 r536 119 119 120 120 $res .= 121 '<form action="'.html::escapeURL($url).'" method="post">'. 122 '<fieldset><legend>'.__('Add a word').'</legend>'. 123 '<p><label class="classic" for="swa">'.__('Add a word').' '.form::field('swa',20,128).'</label>'; 121 '<form action="'.html::escapeURL($url).'" method="post" class="fieldset">'. 122 '<p><label class="classic" for="swa">'.__('Add a word ').' '.form::field('swa',20,128).'</label>'; 124 123 125 124 if ($core->auth->isSuperAdmin()) { … … 130 129 $res .= 131 130 $core->formNonce(). 132 '< input type="submit" value="'.__('Add').'"/></p>'.133 '< /fieldset>'.131 '</p>'. 132 '<p><input type="submit" value="'.__('Add').'"/></p>'. 134 133 '</form>'; 135 134 … … 142 141 { 143 142 $res .= 144 '<form action="'.html::escapeURL($url).'" method="post" >'.145 '< fieldset><legend>' . __('List') . '</legend>'.143 '<form action="'.html::escapeURL($url).'" method="post" class="fieldset">'. 144 '<h3>' . __('List of bad words') . '</h3>'. 146 145 '<div style="'.$this->style_list.'">'; 147 146 … … 167 166 $core->formNonce(). 168 167 '<input class="submit delete" type="submit" value="' . __('Delete selected words') . '"/></p>'. 169 '</f ieldset></form>';168 '</form>'; 170 169 } 171 170 -
plugins/antispam/index.php
r505 r536 128 128 129 129 echo 130 '<form action="'.$p_url.'" method="post" >'.131 '< fieldset><legend>'.__('Information').'</legend>';130 '<form action="'.$p_url.'" method="post" class="fieldset">'. 131 '<h3>'.__('Information').'</h3>'; 132 132 133 133 if (!empty($_GET['del'])) { … … 153 153 echo '<p>'.sprintf(__('All spam comments older than %s day(s) will be automatically deleted.'), $moderationTTL).'</p>'; 154 154 } 155 echo '</f ieldset></form>';155 echo '</form>'; 156 156 157 157 158 158 # Filters 159 159 echo 160 '<form action="'.$p_url.'" method="post">'. 161 '<fieldset><legend>'.__('Available spam filters').'</legend>'; 160 '<form action="'.$p_url.'" method="post" class="fieldset">'; 162 161 163 162 if (!empty($_GET['upd'])) { … … 167 166 echo 168 167 '<table class="dragable">'. 168 '<caption>'.__('Available spam filters').'</caption>'. 169 169 '<thead><tr>'. 170 170 '<th>'.__('Order').'</th>'. … … 192 192 '<td class="nowrap">'.form::checkbox(array('filters_active[]'),$fid,$f->active, '', '', false, 'title="'.__('Active').'"').'</td>'. 193 193 '<td class="nowrap">'.form::checkbox(array('filters_auto_del[]'),$fid,$f->auto_delete, '', '', false, 'title="'.__('Auto Del.').'"').'</td>'. 194 '<td class="nowrap" >'.$f->name.'</td>'.194 '<td class="nowrap" scope="raw">'.$f->name.'</td>'. 195 195 '<td class="maximal">'.$f->description.'</td>'. 196 196 '<td class="status">'.$gui_link.'</td>'. … … 203 203 $core->formNonce(). 204 204 '<input type="submit" name="filters_upd" value="'.__('Save').'" /></p>'. 205 '</f ieldset></form>';205 '</form>'; 206 206 207 207 … … 213 213 214 214 echo 215 '< fieldset><legend>'.__('Syndication').'</legend>'.215 '<h3>'.__('Syndication').'</h3>'. 216 216 '<ul class="spaminfo">'. 217 217 '<li class="feed"><a href="'.$spam_feed.'">'.__('Junk comments RSS feed').'</a></li>'. 218 218 '<li class="feed"><a href="'.$ham_feed.'">'.__('Published comments RSS feed').'</a></li>'. 219 '</ul>'. 220 '</fieldset>'; 219 '</ul>'; 221 220 } 222 221 } … … 225 224 </body> 226 225 </html> 227 -
plugins/pages/page.php
r500 r536 363 363 364 364 echo '<div id="entry-wrapper">'; 365 echo '<div id="entry-content">< fieldsetclass="constrained">';365 echo '<div id="entry-content"><div class="constrained">'; 366 366 367 367 echo … … 396 396 '</p>'; 397 397 398 echo '</ fieldset></div>'; // End #entry-content398 echo '</div></div>'; // End #entry-content 399 399 echo '</div>'; // End #entry-wrapper 400 400 … … 570 570 571 571 '<form action="comment.php" method="post" id="comment-form">'. 572 '< fieldsetclass="constrained">'.572 '<div class="constrained">'. 573 573 '<p><label for="comment_author" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Name:'). 574 574 form::field('comment_author',30,255,html::escapeHTML($core->auth->getInfo('user_cn'))). … … 590 590 $core->formNonce(). 591 591 '<input type="submit" name="add" value="'.__('Save').'" /></p>'. 592 '</ fieldset>'.592 '</div>'. 593 593 '</form>'. 594 594 '</div>';
Note: See TracChangeset
for help on using the changeset viewer.
