Skip to content

Commit

Permalink
added some wanting classes
Browse files Browse the repository at this point in the history
  • Loading branch information
@selfthinker
selfthinker committed Apr 8, 2012
1 parent 8e38227 commit 0607bfe
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 60 deletions.
17 changes: 9 additions & 8 deletions inc/html.php
View file
Expand Up @@ -449,7 +449,7 @@ function html_revisions($first=0, $media_id = false){

if (!$media_id) print p_locale_xhtml('revisions');

$params = array('id' => 'page__revisions');
$params = array('id' => 'page__revisions', 'class' => 'changes');
if ($media_id) $params['action'] = media_managerURL(array('image' => $media_id), '&');

$form = new Doku_Form($params);
Expand Down Expand Up @@ -664,12 +664,13 @@ function html_recent($first=0, $show_changes='both'){
if (getNS($ID) != '')
print '<div class="level1"><p>' . sprintf($lang['recent_global'], getNS($ID), wl('', 'do=recent')) . '</p></div>';

$form = new Doku_Form(array('id' => 'dw__recent', 'method' => 'GET'));
$form = new Doku_Form(array('id' => 'dw__recent', 'method' => 'GET', 'class' => 'changes'));
$form->addHidden('sectok', null);
$form->addHidden('do', 'recent');
$form->addHidden('id', $ID);

if ($conf['mediarevisions']) {
$form->addElement('<div class="changeType">');
$form->addElement(form_makeListboxField(
'show_changes',
array(
Expand All @@ -682,6 +683,7 @@ function html_recent($first=0, $show_changes='both'){
array('class'=>'quickselect')));

$form->addElement(form_makeButton('submit', 'recent', $lang['btn_apply']));
$form->addElement('</div>');
}

$form->addElement(form_makeOpenTag('ul'));
Expand Down Expand Up @@ -1381,7 +1383,7 @@ function html_edit(){
}

$form->addHidden('target', $data['target']);
$form->addElement(form_makeOpenTag('div', array('id'=>'wiki__editbar')));
$form->addElement(form_makeOpenTag('div', array('id'=>'wiki__editbar', 'class'=>'editBar')));
$form->addElement(form_makeOpenTag('div', array('id'=>'size__ctl')));
$form->addElement(form_makeCloseTag('div'));
if ($wr) {
Expand Down Expand Up @@ -1413,13 +1415,12 @@ function html_edit(){
echo 'textChanged = ' . ($mod ? 'true' : 'false');
echo '//--><!]]></script>' . NL;
} ?>
<div style="width:99%;">
<div class="editBox">

<div class="toolbar">
<div id="draft__status"><?php if(!empty($INFO['draft'])) echo $lang['draftdate'].' '.dformat();?></div>
<div id="tool__bar"><?php if ($wr && $data['media_manager']){?><a href="<?php echo DOKU_BASE?>lib/exe/mediamanager.php?ns=<?php echo $INFO['namespace']?>"
target="_blank"><?php echo $lang['mediaselect'] ?></a><?php }?></div>

<div id="draft__status"><?php if(!empty($INFO['draft'])) echo $lang['draftdate'].' '.dformat();?></div>
<div id="tool__bar"><?php if ($wr && $data['media_manager']){?><a href="<?php echo DOKU_BASE?>lib/exe/mediamanager.php?ns=<?php echo $INFO['namespace']?>"
target="_blank"><?php echo $lang['mediaselect'] ?></a><?php }?></div>
</div>
<?php

Expand Down
6 changes: 3 additions & 3 deletions lib/tpl/default/_mediamanager.css
View file
Expand Up @@ -343,18 +343,18 @@

/*____________ Revisions form ____________*/

#mediamanager__page #page__revisions ul {
#mediamanager__page form.changes ul {
margin-left: 10px;
list-style-type: none;
}

#mediamanager__page #page__revisions ul li div.li div {
#mediamanager__page form.changes ul li div.li div {
font-size: 90%;
color: __text_neu__;
padding-left: 18px;
}

#mediamanager__page #page__revisions ul li div.li input {
#mediamanager__page form.changes ul li div.li input {
position: relative;
top: 1px;
}
Expand Down
27 changes: 15 additions & 12 deletions lib/tpl/dokuwiki/css/_edit.css
View file
Expand Up @@ -6,18 +6,21 @@
/* edit view
********************************************************************/

.dokuwiki div.editBox {
}

/*____________ toolbar ____________*/

.dokuwiki div.toolbar {
margin-bottom: .5em;
overflow: hidden;
}
.dokuwiki div.toolbar #draft__status {
#draft__status {
float: right;
color: __text_alt__;
background-color: inherit;
}
.dokuwiki div.toolbar #tool__bar {
#tool__bar {
float: left;
}

Expand Down Expand Up @@ -55,42 +58,42 @@ div.picker button.toolbutton {

/*____________ below the textarea ____________*/

.dokuwiki #wiki__editbar {
.dokuwiki div.editBar {
overflow: hidden;
margin-bottom: .5em;
}

/* size and wrap controls */
.dokuwiki #wiki__editbar #size__ctl {
#size__ctl {
float: right;
}
.dokuwiki #wiki__editbar #size__ctl img {
#size__ctl img {
cursor: pointer;
}

/* edit buttons */
.dokuwiki #wiki__editbar .editButtons {
.dokuwiki .editBar .editButtons {
display: inline;
margin-right: 1em;
}
.dokuwiki #wiki__editbar .editButtons input {
.dokuwiki .editBar .editButtons input {
}

/* summary input and minor changes checkbox */
.dokuwiki #wiki__editbar .summary {
.dokuwiki .editBar .summary {
display: inline;
}
.dokuwiki #wiki__editbar .summary label {
.dokuwiki .editBar .summary label {
vertical-align: middle;
white-space: nowrap;
}
.dokuwiki #wiki__editbar .summary label span {
.dokuwiki .editBar .summary label span {
vertical-align: middle;
}
.dokuwiki #wiki__editbar .summary input {
.dokuwiki .editBar .summary input {
}
/* change background colour if summary is missing */
.dokuwiki #wiki__editbar .summary input.missing {
.dokuwiki .editBar .summary input.missing {
color: __text__;
background-color: #ffcccc;
}
Expand Down
41 changes: 14 additions & 27 deletions lib/tpl/dokuwiki/css/_recent.css
View file
Expand Up @@ -5,54 +5,41 @@

/*____________ list of revisions / recent changes ____________*/

/* select type of revisions (media/pages), should have a class on it's own, but hasn't */
.dokuwiki #dw__recent label {
/* select type of revisions (media/pages) */
.dokuwiki .changeType {
margin-bottom: .5em;
display: block;
}

.dokuwiki #dw__recent ul li,
.dokuwiki #page__revisions ul li {
.dokuwiki form.changes ul li {
list-style: none;
margin-left: 0;
}
.dokuwiki #dw__recent ul li span,
.dokuwiki #dw__recent ul li a,
.dokuwiki #page__revisions ul li span,
.dokuwiki #page__revisions ul li a {
.dokuwiki form.changes ul li span,
.dokuwiki form.changes ul li a {
vertical-align: middle;
}
.dokuwiki #dw__recent ul li span.user a,
.dokuwiki #page__revisions ul li span.user a {
.dokuwiki form.changes ul li span.user a {
vertical-align: bottom;
}
.dokuwiki #dw__recent ul li.minor,
.dokuwiki #page__revisions ul li.minor {
.dokuwiki form.changes ul li.minor {
opacity: .7;
}

.dokuwiki #dw__recent li span.date,
.dokuwiki #page__revisions li span.date {
.dokuwiki form.changes li span.date {
}
.dokuwiki #dw__recent li a.diff_link,
.dokuwiki #page__revisions li a.diff_link {
.dokuwiki form.changes li a.diff_link {
vertical-align: baseline;
}
.dokuwiki #dw__recent li a.revisions_link,
.dokuwiki #page__revisions li a.revisions_link {
.dokuwiki form.changes li a.revisions_link {
vertical-align: baseline;
}
.dokuwiki #dw__recent li a.wikilink1,
.dokuwiki #dw__recent li a.wikilink2,
.dokuwiki #page__revisions li a.wikilink1,
.dokuwiki #page__revisions li a.wikilink2 {
.dokuwiki form.changes li a.wikilink1,
.dokuwiki form.changes li a.wikilink2 {
}
.dokuwiki #dw__recent li span.sum,
.dokuwiki #page__revisions li span.sum {
.dokuwiki form.changes li span.sum {
font-weight: bold;
}
.dokuwiki #dw__recent li span.user,
.dokuwiki #page__revisions li span.user {
.dokuwiki form.changes li span.user {
}


Expand Down
3 changes: 1 addition & 2 deletions lib/tpl/dokuwiki/css/mobile.css
View file
Expand Up @@ -65,8 +65,7 @@
}

/* _recent */
.dokuwiki #dw__recent ul,
.dokuwiki #page__revisions ul {
.dokuwiki form.changes ul {
padding-left: 0;
}

Expand Down
14 changes: 6 additions & 8 deletions lib/tpl/dokuwiki/css/rtl.css
View file
Expand Up @@ -166,8 +166,7 @@

/*____________ _recent ____________*/

[dir=rtl] .dokuwiki #dw__recent ul li,
[dir=rtl] .dokuwiki #page__revisions ul li {
[dir=rtl] .dokuwiki form.changes ul li {
margin-right: 0;
}

Expand All @@ -177,16 +176,16 @@

/*____________ _edit ____________*/

[dir=rtl] .dokuwiki div.toolbar #draft__status {
[dir=rtl] #draft__status {
float: left;
}
[dir=rtl] .dokuwiki #wiki__editbar #size__ctl {
[dir=rtl] #size__ctl {
float: left;
}
[dir=rtl] .dokuwiki #wiki__editbar #size__ctl img {
[dir=rtl] #size__ctl img {
cursor: pointer;
}
[dir=rtl] .dokuwiki #wiki__editbar .editButtons {
[dir=rtl] .dokuwiki .editBar .editButtons {
margin-right: 0;
margin-left: 1em;
}
Expand Down Expand Up @@ -544,8 +543,7 @@
border-right-width: 0;
}

[dir=rtl] .dokuwiki #dw__recent ul,
[dir=rtl] .dokuwiki #page__revisions ul {
[dir=rtl] .dokuwiki form.changes ul {
padding-right: 0;
}

Expand Down

0 comments on commit 0607bfe

Please sign in to comment.