summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorKate Arzamastseva <pshns@ukr.net>2011-08-24 22:34:06 +0300
committerKate Arzamastseva <pshns@ukr.net>2011-08-24 22:34:06 +0300
commit035e07f1301d5d7a13de017640d80db14d300ac3 (patch)
tree2add92660f96a22663b3403b229738ca198a142a /lib
parent1a75cea634d47c0fac768a8c12df4e49fe3860c2 (diff)
downloadrpg-035e07f1301d5d7a13de017640d80db14d300ac3.tar.gz
rpg-035e07f1301d5d7a13de017640d80db14d300ac3.tar.bz2
issue #57, function names, params, html fixes
Diffstat (limited to 'lib')
-rw-r--r--lib/exe/ajax.php6
-rw-r--r--lib/exe/css.php4
-rw-r--r--lib/tpl/default/mediamanager.css2
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php
index 7fcccd4d9..a6e45c4de 100644
--- a/lib/exe/ajax.php
+++ b/lib/exe/ajax.php
@@ -209,7 +209,7 @@ function ajax_medialist(){
$NS = $_POST['ns'];
if ($_POST['do'] == 'media') {
- tpl_fileList();
+ tpl_mediaFileList();
} else {
tpl_mediaContent(true);
}
@@ -232,7 +232,7 @@ function ajax_mediadetails(){
if (isset($REV) && !$JUMPTO) $rev = $REV;
html_msgarea();
- tpl_fileDetails($image, $rev);
+ tpl_mediaFileDetails($image, $rev);
}
/**
@@ -268,7 +268,7 @@ function ajax_mediaupload(){
$id = cleanID($id, false, true);
if ($res) $result = array('success' => true,
- 'link' => media_managerURL(array('ns' => $NS, 'image' => $id), '&'),
+ 'link' => media_managerURL(array('ns' => $NS, 'image' => $NS.':'.$id), '&'),
'id' => $NS.':'.$id, 'ns' => $NS);
if (!$result) {
diff --git a/lib/exe/css.php b/lib/exe/css.php
index 8f86f2433..81f47d8fa 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -189,7 +189,7 @@ function css_interwiki(){
function css_filetypes(){
// default style
- echo 'a.mediafile {';
+ echo '.mediafile {';
echo ' background: transparent url('.DOKU_BASE.'lib/images/fileicons/file.png) 0px 1px no-repeat;';
echo ' padding-left: 18px;';
echo ' padding-bottom: 1px;';
@@ -212,7 +212,7 @@ function css_filetypes(){
}
foreach($exts as $ext=>$type){
$class = preg_replace('/[^_\-a-z0-9]+/','_',$ext);
- echo "a.mf_$class {";
+ echo ".mf_$class {";
echo ' background-image: url('.DOKU_BASE.'lib/images/fileicons/'.$ext.$type.')';
echo '}';
}
diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 245bb5550..16982d98d 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -291,7 +291,7 @@
}
#media__content #mediamanager__uploader {
- border-bottom: 1px solid #8CACBB;
+ border-bottom: 1px solid __border__;
padding-bottom: 0.5em;
}