Skip to content

Commit

Permalink
html validity fixes (removed name and align in some plugins)
Browse files Browse the repository at this point in the history
  • Loading branch information
selfthinker committed Aug 5, 2012
1 parent 24d4949 commit 63e967b
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 14 deletions.
12 changes: 6 additions & 6 deletions inc/media.php
Expand Up @@ -1383,9 +1383,9 @@ function media_printfile($item,$auth,$jump,$display_namespace=false){
// output
echo '<div class="'.$zebra.'"'.$jump.' title="'.hsc($item['id']).'">'.NL;
if (!$display_namespace) {
echo '<a name="h_:'.$item['id'].'" class="'.$class.'">'.hsc($file).'</a> ';
echo '<a id="h_:'.$item['id'].'" class="'.$class.'">'.hsc($file).'</a> ';
} else {
echo '<a name="h_:'.$item['id'].'" class="'.$class.'">'.hsc($item['id']).'</a><br/>';
echo '<a id="h_:'.$item['id'].'" class="'.$class.'">'.hsc($item['id']).'</a><br/>';
}
echo '<span class="info">('.$info.')</span>'.NL;

Expand Down Expand Up @@ -1449,7 +1449,7 @@ function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false
media_printimgdetail($item, true);

} else {
echo '<a name="d_:'.$item['id'].'" class="image" title="'.$item['id'].'" href="'.
echo '<a id="d_:'.$item['id'].'" class="image" title="'.$item['id'].'" href="'.
media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']),
'tab_details' => 'view')).'">';
echo media_printicon($item['id']);
Expand All @@ -1462,7 +1462,7 @@ function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false
$name = hsc($item['id']);
}
echo '<dd class="name"><a href="'.media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']),
'tab_details' => 'view')).'" name="h_:'.$item['id'].'">'.$name.'</a></dd>'.NL;
'tab_details' => 'view')).'" id="h_:'.$item['id'].'">'.$name.'</a></dd>'.NL;

if($item['isimg']){
$size = '';
Expand Down Expand Up @@ -1510,7 +1510,7 @@ function media_printimgdetail($item, $fullscreen=false){

// output
if ($fullscreen) {
echo '<a name="l_:'.$item['id'].'" class="image thumb" href="'.
echo '<a id="l_:'.$item['id'].'" class="image thumb" href="'.
media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']), 'tab_details' => 'view')).'">';
echo '<img src="'.$src.'" '.$att.' />';
echo '</a>';
Expand All @@ -1520,7 +1520,7 @@ function media_printimgdetail($item, $fullscreen=false){

echo '<div class="detail">';
echo '<div class="thumb">';
echo '<a name="d_:'.$item['id'].'" class="select">';
echo '<a id="d_:'.$item['id'].'" class="select">';
echo '<img src="'.$src.'" '.$att.' />';
echo '</a>';
echo '</div>';
Expand Down
10 changes: 5 additions & 5 deletions lib/plugins/acl/admin.php
Expand Up @@ -191,7 +191,7 @@ function html() {
echo '</div>'.NL;

echo '<div class="footnotes"><div class="fn">'.NL;
echo '<sup><a id="fn__1" class="fn_bot" name="fn__1" href="#fnt__1">1)</a></sup>'.NL;
echo '<sup><a id="fn__1" class="fn_bot" href="#fnt__1">1)</a></sup>'.NL;
echo $this->getLang('p_include');
echo '</div></div>';

Expand Down Expand Up @@ -602,7 +602,7 @@ function _html_table(){
echo '<tr>';
echo '<th>'.$this->getLang('where').'</th>';
echo '<th>'.$this->getLang('who').'</th>';
echo '<th>'.$this->getLang('perm').'<sup><a id="fnt__1" class="fn_top" name="fnt__1" href="#fn__1">1)</a></sup></th>';
echo '<th>'.$this->getLang('perm').'<sup><a id="fnt__1" class="fn_top" href="#fn__1">1)</a></sup></th>';
echo '<th>'.$lang['btn_delete'].'</th>';
echo '</tr>';
foreach($this->acl as $where => $set){
Expand Down Expand Up @@ -630,15 +630,15 @@ function _html_table(){
echo $this->_html_checkboxes($perm,$ispage,'acl['.$where.']['.$who.']');
echo '</td>';

echo '<td align="center">';
echo '<td class="check">';
echo '<input type="checkbox" name="del['.hsc($where).'][]" value="'.hsc($who).'" />';
echo '</td>';
echo '</tr>';
}
}

echo '<tr>';
echo '<th align="right" colspan="4">';
echo '<th class="action" colspan="4">';
echo '<input type="submit" value="'.$lang['btn_update'].'" name="cmd[update]" class="button" />';
echo '</th>';
echo '</tr>';
Expand Down Expand Up @@ -746,7 +746,7 @@ function _html_checkboxes($setperm,$ispage,$name){
}

//build code
$ret .= '<label for="pbox'.$label.'" title="'.$this->getLang('acl_perm'.$perm).'"'.$class.'>';
$ret .= '<label for="pbox'.$label.'"'.$class.'>';
$ret .= '<input '.buildAttributes($atts).' />&#160;';
$ret .= $this->getLang('acl_perm'.$perm);
$ret .= '</label>'.NL;
Expand Down
8 changes: 8 additions & 0 deletions lib/plugins/acl/style.css
Expand Up @@ -67,6 +67,14 @@ div#acl_manager table.inline {
margin: 0;
}

#acl_manager table .check {
text-align: center;
}

#acl_manager table .action {
text-align: right;
}

div#acl_manager .aclgroup {
background: transparent url(pix/group.png) 0px 1px no-repeat;
padding: 1px 0px 1px 18px;
Expand Down
2 changes: 1 addition & 1 deletion lib/plugins/config/admin.php
Expand Up @@ -351,7 +351,7 @@ function getTOC() {
}

function _print_h1($id, $text) {
ptln('<h1><a name="'.$id.'" id="'.$id.'">'.$text.'</a></h1>');
ptln('<h1 id="'.$id.'">'.$text.'</h1>');
}


Expand Down
4 changes: 2 additions & 2 deletions lib/scripts/media.js
Expand Up @@ -497,7 +497,7 @@ var dw_mediamanager = {
var maxWidth = widthFull - (widthOtherResizable + minWidthNonResizable);
$resizables.resizable( "option", "maxWidth", maxWidth );

// width of file panel in % = 100% - width of resizables in %
// width of file panel in % = 100% - width of resizables in %
// this calculates with 99.99 and not 100 to overcome rounding errors
var relWidthNonResizable = 99.99 - (100 * widthResizables / widthFull);
// set width of file panel
Expand Down Expand Up @@ -699,7 +699,7 @@ var dw_mediamanager = {
event.preventDefault();

$link = jQuery(this);
id = $link.attr('name').substr(2);
id = $link.attr('id').substr(2);

if(!opener){
// if we don't run in popup display example
Expand Down

0 comments on commit 63e967b

Please sign in to comment.