Commit 30e40b97 authored by Martyn Smith's avatar Martyn Smith Committed by Martyn Smith
Browse files
parents c2d184dc 350fd93b
mahara (0.3-1) unstable; urgency=low
* New release
-- Martyn Smith <martyn@flange.wgtn.cat-it.co.nz> Fri, 12 Jan 2007 21:52:46 +1300
mahara (0.2-2) unstable; urgency=low
* Added servername to the config file
......
......@@ -7,7 +7,7 @@
<div class="maincontent">
<h2>{str section="artefact.blog" tag="blogsettings"}</h2>
<div>
<div class="viewblogbtn">
<a href="{$WWWROOT}artefact/blog/view/?id={$blog->get('id')}">{str section="artefact.blog" tag="viewblog"}</a>
</div>
{$editform}
......
......@@ -14,21 +14,21 @@
<h2>{str section="artefact.blog" tag="viewblog"} - {$blog->get('title')|escape}</h2>
<div id="myblogs">
<div>
<a href="{$WWWROOT}artefact/blog/settings/?id={$blog->get('id')}">{str section="artefact.blog" tag="settings"}</a>
</div>
<div class="blogsettings">
<div class="addicon">
<a href="{$WWWROOT}artefact/blog/editpost.php?blog={$blog->get('id')}">{str section="artefact.blog" tag="addpost"}</a>
</div>
<a href="{$WWWROOT}artefact/blog/settings/?id={$blog->get('id')}">{str section="artefact.blog" tag="settings"}</a>
</div>
<div class="addicon">
<a href="{$WWWROOT}artefact/blog/editpost.php?blog={$blog->get('id')}">{str section="artefact.blog" tag="addpost"}</a>
</div>
<table id="postlist" class="tablerenderer">
<tbody>
<tr><td></td><td></td><td></td></tr>
</tbody>
</table>
</div>
<div><table id="postlist" class="tablerenderer">
<tbody>
<tr><td></td><td></td><td></td></tr>
</tbody>
</table></div>
</div>
{include file="columnleftend.tpl"}
{include file="footer.tpl"}
......@@ -4,7 +4,7 @@
{include file="adminmenu.tpl"}
</div>
{include file="columnleftstart.tpl"}
<div class="fr"><a href="profileicons.php">{str tag="editprofileicons" section="artefact.internal"} &raquo;</a></div>
<!--<div class="fr"><a href="profileicons.php">{str tag="editprofileicons" section="artefact.internal"} &raquo;</a></div>-->
<h2>{str section="artefact.internal" tag="profile"}</h2>
{$profileform}
{include file="columnleftend.tpl"}
......
......@@ -53,7 +53,7 @@ $CFG = (object)array_merge((array)$cfg, (array)$CFG);
// Fix up paths in $CFG
foreach (array('docroot', 'dataroot') as $path) {
$CFG->{$path} = realpath((substr($CFG->{$path}, -1) != DIRECTORY_SEPARATOR) ? $CFG->{$path} . DIRECTORY_SEPARATOR : $CFG->{$path}) . "/";
$CFG->{$path} = (substr($CFG->{$path}, -1) != DIRECTORY_SEPARATOR) ? $CFG->{$path} . DIRECTORY_SEPARATOR : $CFG->{$path} . "/";
}
// xmldb stuff
......
......@@ -521,7 +521,7 @@ function get_dataroot_image_path($path, $id, $size) {
log_debug('directory ' . $imagepath . ' is not a directory or is not readable');
return false;
}
$imagepath .= "/$id";
//$imagepath .= "/$id";
log_debug('directory is ' . $imagepath);
if ($size && !preg_match('/\d+x\d+/', $size)) {
......@@ -530,7 +530,7 @@ function get_dataroot_image_path($path, $id, $size) {
}
// If the image is already available, return the path to it
$path = $imagepath . '/' . ($size ? "$size/" : '') . $id;
$path = $imagepath . '/' . ($size ? "$size/" : '') . ($id % 256) . "/$id";
if (is_readable($path)) {
log_debug('the image is available at ' . $path);
return $path;
......@@ -539,7 +539,8 @@ function get_dataroot_image_path($path, $id, $size) {
if ($size) {
// Image is not available in this size. If there is a base image for
// it, we can make one however.
$originalimage = $imagepath . "/$id";
$originalimage = $imagepath . '/' . ($id % 256) . "/$id";
log_debug('original image = ' . $originalimage);
if (is_readable($originalimage)) {
log_debug('creating correct sized image');
......@@ -580,8 +581,11 @@ function get_dataroot_image_path($path, $id, $size) {
$newih = imagecreatetruecolor($newx, $newy);
imagecopyresized($newih, $oldih, 0, 0, 0, 0, $newx, $newy, $oldx, $oldy);
imageinterlace($newih);
$result = imagepng($newih, $path);
return $path;
$newpath = $imagepath . "/$size/" . ($id % 256);
check_dir_exists($newpath);
$newpath .= "/$id";
$result = imagepng($newih, $newpath);
return $newpath;
}
}
......
htdocs/theme/default/static/loading.gif

700 Bytes | W: | H:

htdocs/theme/default/static/loading.gif

701 Bytes | W: | H:

htdocs/theme/default/static/loading.gif
htdocs/theme/default/static/loading.gif
htdocs/theme/default/static/loading.gif
htdocs/theme/default/static/loading.gif
  • 2-up
  • Swipe
  • Onion skin
htdocs/theme/default/static/menuarrow.gif

68 Bytes | W: | H:

htdocs/theme/default/static/menuarrow.gif

55 Bytes | W: | H:

htdocs/theme/default/static/menuarrow.gif
htdocs/theme/default/static/menuarrow.gif
htdocs/theme/default/static/menuarrow.gif
htdocs/theme/default/static/menuarrow.gif
  • 2-up
  • Swipe
  • Onion skin
......@@ -2,12 +2,12 @@
div.calendar { position: relative; }
.calendar, .calendar table {
border: 1px solid #565;
.calendar table {
border: 1px solid #d4d1c0;
font-size: 11px;
color: #000;
cursor: default;
background: #efe;
background: #e5e8da;
font-family: Arial,sans-serif;
}
......@@ -16,34 +16,34 @@ div.calendar { position: relative; }
.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
text-align: center; /* They are the navigation buttons */
padding: 2px; /* Make the buttons seem like they're pressing */
background-color: #497424;
color: #fff;
background-color: #5c8727;
color: #FFFFFF;
}
.calendar .nav {
background: #497424 url('../menuarrow.gif') no-repeat 100% 100%;
background: #5c8727 url('../menuarrow.gif') no-repeat 100% 100%;
}
.calendar thead .title { /* This holds the current "month, year" */
font-weight: bold; /* Pressing it will take you to the current date */
text-align: center;
padding: 2px;
background: #360;
color: #efa;
background: #3a5813;
color: #e6c55b;
}
.calendar thead .headrow { /* Row <TR> containing navigation buttons */
}
.calendar thead .name { /* Cells <TD> containing the day names */
border-bottom: 1px solid #565;
border-bottom: 1px solid #d4d1c0;
padding: 2px;
text-align: center;
color: #030;
color: #3a5813;
}
.calendar thead .weekend { /* How a weekend day name shows in header */
color: #585;
color: #585713;
}
.calendar thead .hilite { /* How do the buttons in header appear when hover */
......@@ -54,7 +54,8 @@ div.calendar { position: relative; }
}
.calendar thead .daynames { /* Row <TR> containing the day names */
background: #dfb;
background: #819f18;
font-weight: bold;
}
/* The body part -- contains all the days in month. */
......@@ -70,44 +71,44 @@ div.calendar { position: relative; }
color: #bbb;
}
.calendar tbody .day.othermonth.oweekend {
color: #fbb;
color: #585713;
}
.calendar table .wn {
padding: 2px 3px 2px 2px;
border-right: 1px solid #8a8;
background: #dfb;
background: #acc067;
}
.calendar tbody .rowhilite td {
background: #dfb;
background: #f3f8df;
}
.calendar tbody .rowhilite td.wn {
background: #efe;
background: #acc067;
}
.calendar tbody td.hilite { /* Hovered cells <TD> */
background: #efd;
background: #c0cd89;
padding: 1px 3px 1px 1px;
border: 1px solid #bbb;
border: none;
}
.calendar tbody td.active { /* Active (pressed) cells <TD> */
background: #dec;
padding: 2px 2px 0px 2px;
border: none;
}
.calendar tbody td.selected { /* Cell showing today date */
font-weight: bold;
border: 1px solid #585;
border: 1px solid #FFFFFF;
padding: 1px 3px 1px 1px;
background: #f8fff8;
color: #585;
background: #e6c55b;
color: #3a5813;
}
.calendar tbody td.weekend { /* Cells showing weekend days */
color: #696;
color: #585713;
}
.calendar tbody td.today { font-weight: bold; color: #696; }
......@@ -126,14 +127,14 @@ div.calendar { position: relative; }
.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
text-align: center;
background: #360;
color: #efa;
background: #3a5813;
color: #e6c55b;
}
.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
padding: 2px;
background: #360;
color: #efa;
background: #3a5813;
color: #e6c55b;
}
.calendar tfoot .hilite { /* Hover style for buttons in footer */
......@@ -151,8 +152,8 @@ div.calendar { position: relative; }
left: 0px;
width: 4em;
cursor: default;
border: 1px solid #565;
background: #efd;
border: 1px solid #d4d1c0;
background: #f3f8df;
color: #000;
font-size: 90%;
z-index: 100;
......@@ -169,30 +170,29 @@ div.calendar { position: relative; }
}
.calendar .combo .hilite {
background: #af8;
background: #FFFFFF;
}
.calendar .combo .active {
border-top: 1px solid #6a4;
border-bottom: 1px solid #6a4;
background: #efe;
border-top: 1px solid #5c8727;
border-bottom: 1px solid #5c8727;
background: #f3f8df;
font-weight: bold;
}
.calendar td.time {
border-top: 1px solid #8a8;
border-top: 1px solid #d4d1c0;
padding: 1px 0px;
text-align: center;
background-color: #dfb;
background-color: #819f18;
}
.calendar td.time .hour,
.calendar td.time .minute,
.calendar td.time .ampm {
padding: 0px 3px 0px 4px;
border: 1px solid #8a8;
font-weight: bold;
background-color: #fff;
background-color: #ffffff;
color: #030;
}
......@@ -206,9 +206,9 @@ div.calendar { position: relative; }
}
.calendar td.time span.hilite {
border-color: #aca;
background-color: #efe;
color: #363;
border-color: #819f18;
background-color: #f3f8df;
color: #3a5813;
}
.calendar td.time span.active {
......
......@@ -581,9 +581,12 @@ div.sidebar {
padding: 10px 3px 10px 3px;
color: #e3ac03;
text-align: left;
float: left;
float: none;
font-style: italic;
}
.maincontent # #messagediv {
float: left;
}
/* inner white corners around main content begin */
.box-cnrs {
......@@ -765,10 +768,10 @@ p {
.maincontent tfoot tr td a:link,
.maincontent tfoot tr td a:active,
.maincontent tfoot tr td a:visited {
font-size: 11px;
font-weight: bold;
color: #5c8727;
margin: 0 10px;
font-size: 11px;
}
.maincontent thead tr td a:hover,
.maincontent tfoot tr td a:hover {
......@@ -788,7 +791,6 @@ acronym {
}
.description {
font-size: 9px;
font-style: italic;
color: #7e7e7e;
padding-bottom: 5px;
}
......@@ -836,7 +838,6 @@ table#installer {
#profileform_email_container a:visited,
#profileform_email_container a:hover {
margin: 0 0 0 25px;
font-size: 11px;
}
#profileform_email_container #email_list a,
#profileform_email_container #email_list a:link,
......@@ -858,16 +859,33 @@ table#installer {
}
/* My Blogs styles */
#myblogs .newblog,
#myblogs .blogsettings .addicon {
margin: 0px 0 5px 0;
text-align: right;
float: right;
}
#myblogs .addicon {
margin: 10px 0 5px 0;
text-align: right;
}
#myblogs .newpost {
margin: 10px 0 10px 5px;
margin: 0px 0 5px 0;
text-align: right;
float: right;
}
#myblogs .blogsettings {
margin: 10px 0 5px 0;
}
#myblogs .addicon a,
#myblogs .addicon a:link,
#myblogs .addicon a:active,
#myblogs .addicon a:visited,
#myblogs .addicon a:hover {
#myblogs .addicon a:hover,
#myblogs .blogsettings .addicon a,
#myblogs .blogsettings .addicon a:link,
#myblogs .blogsettings .addicon a:active,
#myblogs .blogsettings .addicon a:visited,
#myblogs .blogsettings .addicon a:hover {
background: url(../images/btn_add.gif) no-repeat;
width: 120px;
height: 24px;
......@@ -875,6 +893,36 @@ table#installer {
font-weight: bold;
padding: 4px 23px 6px 47px;
}
#myblogs .blogsettings a,
#myblogs .blogsettings a:link,
#myblogs .blogsettings a:active,
#myblogs .blogsettings a:visited,
#myblogs .blogsettings a:hover {
background: url(../images/btn_medium_off.gif) no-repeat;
width: 100px;
height: 24px;
color: #eef7d4;
font-weight: bold;
padding: 4px 26px 6px 27px;
}
.maincontent .viewblogbtn {
margin: 10px 0 10px 0;
}
.maincontent .viewblogbtn a,
.maincontent .viewblogbtn a:link,
.maincontent .viewblogbtn a:active,
.maincontent .viewblogbtn a:visited,
.maincontent .viewblogbtn a:hover {
background: url(../images/btn_medium_off.gif) no-repeat;
border: 0;
width: 100px;
height: 24px;
color: #FFFFFF;
font-size: 11px;
font-weight: bold;
margin: 0;
padding: 5px 25px 5px 25px;
}
#myblogs .newpost a,
#myblogs .newpost a:link,
#myblogs .newpost a:active,
......@@ -887,10 +935,6 @@ table#installer {
font-weight: bold;
padding: 4px 34px 7px 36px;
}
.maincontent #editblog table {
padding: 10px 0 0 0;
border-top: 1px solid #d4d1c0;
}
.maincontent #editblog_commentsnotify_container label,
.maincontent #editblog_commentsallowed_container label,
.maincontent #newblog_commentsallowed_container label,
......@@ -898,8 +942,78 @@ table#installer {
font-weight: normal;
color: #000000;
}
.maincontent #postlist tbody tr th {
padding: 2px 5px;
background-color: #e5e8da;
}
.maincontent #postlist table {
border: none;
background-color: #f3f5e9;
}
.maincontent #postlist th input {
background: url(../images/btn_short_short.gif) no-repeat;
width: 50px;
height: 18px;
padding: 0;
margin: 1px;
}
/* My Files styles */
#foldernav {
font-weight: bold;
margin: 15px 0 0 3px;
padding: 3px 0 0 25px;
font-size: 15px;
background: url(../images/foldernav.gif) no-repeat;
}
.maincontent #myfiles #filelist tbody tr td,
#uploader th {
vertical-align: top;
}
.maincontent #myfiles #filelist tbody tr td a,
.maincontent #filebrowser tbody tr td a {
font-weight: bold;
}
.maincontent #filebrowser input /*,
.maincontent #myfiles #filelist input*/ {
background: url(../images/btn_short_short.gif) no-repeat;
width: 50px;
height: 18px;
padding: 0;
margin: 1px;
border: none;
}
#uploader #uploadform table {
padding: 5px 10px;
background-color: #f4f8e7;
border: 0;
}
.maincontent #myfiles #createfolderform table {
padding: 5px 10px;
background-color: #e3ecc2;
border: 0;
}
#uploadformmessage,
#createfolderformmessage {
padding: 3px 0 0 0;
color: #dd0221;
text-align: left;
}
#uploadform input.text,
#createfolderform input.text {
border: 1px solid #d4d1c0;
padding: 1px 2px 1px 2px;
}
.maincontent #filelist table {
border: none;
padding: 5px 10px;
background-color: #e3ecc2;
}
.maincontent #filelist table td {
padding: 0;
}
/* My Groups styles */
.maincontent #mygroups #addnewgroupdiv {
margin: 10px 0 10px 0;
......
......@@ -34,7 +34,7 @@
</tbody>
<tfoot>
<tr>
<td colspan="5" class="markasreadtd"><div id="messagediv"></div><div class="markasread"><input class="submit" type="submit" value="{str tag='markasread' section='activity'}" /></div></td>
<td colspan="5" class="markasreadtd"><div class="markasread"><input class="submit" type="submit" value="{str tag='markasread' section='activity'}" /></div><div id="messagediv"></div></td>
</tr>
</tfoot>
</table>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment