Commit 5b69e1fb authored by Martyn Smith's avatar Martyn Smith Committed by Martyn Smith
Browse files
parents accf258a 09897c91
mahara (0.3.1-1) unstable; urgency=low
* Bugfix release
* Add question about SMTP hosts to config
* Fixed Martyn's e-mail address
-- Nigel McNie <nigel@catalyst.net.nz> Mon, 15 Jan 2007 13:14:50 +1300
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
-- Martyn Smith <martyn@catalyst.net.nz> Fri, 12 Jan 2007 21:52:46 +1300
mahara (0.2-2) unstable; urgency=low
* Added servername to the config file
* Added simple mod_expires directives for the default theme and js
-- Martyn Smith <martyn@flange.wgtn.cat-it.co.nz> Fri, 12 Jan 2007 09:22:16 +1300
-- Martyn Smith <martyn@catalyst.net.nz> Fri, 12 Jan 2007 09:22:16 +1300
mahara (0.2-1) unstable; urgency=low
......
......@@ -4,14 +4,12 @@
</div>
{include file="columnleftstart.tpl"}
<div class="maincontent">
<h2>{str section="artefact.blog" tag="blogsettings"}</h2>
<div class="viewblogbtn">
<a href="{$WWWROOT}artefact/blog/view/?id={$blog->get('id')}">{str section="artefact.blog" tag="viewblog"}</a>
</div>
{$editform}
</div>
{include file="columnleftend.tpl"}
{include file="footer.tpl"}
......@@ -167,7 +167,7 @@ function forgotpasschange_validate(Pieform $form, $values) {
// password_validate to maharalib, use it in places specified, test with a drop/create run
// support autofocus => (true|'id'), remove stuff doing autofocus from where it is, focus error fields
// commit stuff
function forgotpasschange_submit($values) {
function forgotpasschange_submit(Pieform $form, $values) {
global $SESSION, $USER;
if (!$user = get_record('usr', 'id', $values['user'])) {
......
......@@ -481,7 +481,7 @@ function suspend_user($suspendeduserid, $reason, $suspendinguserid=null) {
* handle the add/remove/approve/reject friend form
* @param array $values from pieforms.
*/
function friend_submit($values, Pieform $form) {
function friend_submit(Pieform $form, $values) {
global $user, $USER;
log_debug($values);
......
......@@ -78,9 +78,9 @@ tinyMCE.init({
editor_selector: 'wysiwyg',
button_tile_map: true,
theme: "advanced",
plugins: "table,emotions,iespell,inlinepopups",
theme_advanced_buttons1 : "bold,italic,underline,strikethrough,separator,forecolor,backcolor,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,hr,emotions,iespell,cleanup,separator,link,unlink",
theme_advanced_buttons2 : "tablecontrols,separator,cut,copy,paste",
plugins: "table,emotions,iespell,inlinepopups,paste",
theme_advanced_buttons1 : "bold,italic,underline,strikethrough,separator,forecolor,backcolor,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,hr,emotions,iespell,cleanup,separator,link,unlink,separator,code",
theme_advanced_buttons2 : "tablecontrols,separator,cut,copy,paste,pasteword",
theme_advanced_buttons3 : "fontselect,separator,fontsizeselect,separator,formatselect",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "center",
......
body {
margin: 0;
padding: 0 0 10px 0;
......@@ -49,7 +50,7 @@ form {
margin: 0;
}
input.text, input.password, textarea {
input.text, input.password, textarea, input {
border: 1px solid #d4d1c0;
padding: 1px 2px 1px 2px;
}
......@@ -119,7 +120,7 @@ div.grippie {
border: 0;
width: 50px;
height: 24px;
color: #FFFFFF;
color: #eef7d4;
font-size: 11px;
font-weight: bold;
margin: 5px 2px 0 0;
......@@ -129,12 +130,13 @@ div.grippie {
/* medium submit buttons max width 100px */
input.submitcancel,
input.submit,
input.button {
input.button,
#createview4_submit {
background: url(../images/btn_medium_off.gif) no-repeat;
border: 0;
width: 100px;
height: 24px;
color: #FFFFFF;
color: #eef7d4;
font-size: 11px;
font-weight: bold;
margin: 5px 2px 0 0;
......@@ -144,7 +146,6 @@ input.button {
/* long submit buttons max width 200px */
#buttons #buttons_unsuspend,
#buttons #buttons_export,
#buttons #buttons_delete,
#uploadcsv_submit,
#siteoptions_submit,
#createnew,
......@@ -155,7 +156,7 @@ input.button {
border: 0;
width: 200px;
height: 24px;
color: #FFFFFF;
color: #eef7d4;
font-size: 11px;
font-weight: bold;
margin: 5px 2px 0 0;
......@@ -463,7 +464,7 @@ div.sidebar {
padding: 0;
}
#column-right #login_login_username_container {
margin-top: 25px;
padding-top: 25px;
}
#column-right #login_login_password_container {
margin: 5px 0;
......@@ -518,7 +519,7 @@ div.sidebar {
#column-right .sidebarforgotpassword a:active,
#column-right .sidebarforgotpassword a:visited {
background: url(../images/icon_question.gif) no-repeat left;
padding-left: 17px;
padding-left: 20px;
color: #547c22;
text-decoration: none;
font-weight: bold;
......@@ -532,7 +533,7 @@ div.sidebar {
border: 0;
width: 50px;
height: 24px;
color: #FFFFFF;
color: #eef7d4
font-size: 11px;
font-weight: bold;
margin: 0 2px 0 0;
......@@ -695,9 +696,7 @@ p {
.maincontent #search table,
.maincontent #contactus table,
.maincontent #loginbox table,
.maincontent #results table,
.maincontent #forgotpass table,
.maincontent #adminnotifications table,
.maincontent #institution table,
.maincontent #profileprefs table,
.maincontent #newblog table,
......@@ -789,7 +788,8 @@ acronym {
vertical-align: super;
text-decoration: none;
}
.description {
.description,
.emptycontainer {
font-size: 9px;
color: #7e7e7e;
padding-bottom: 5px;
......@@ -825,10 +825,22 @@ table#installer {
padding: 0;
}
#view #publicfeedback {
margin: 10px 0 0 0;
}
#view #viewmenu {
margin: 10px 0 0 0;
}
/* Register styles */
#register_tandc_container label {
font-weight: normal;
}
#register_tandc_container th {
vertical-align: text-top;
}
#register
/* My Profile styles */
......@@ -865,8 +877,9 @@ table#installer {
float: right;
}
#myblogs .addicon {
margin: 10px 0 5px 0;
margin: 5px 0 5px 0;
text-align: right;
padding: 5px 0;
}
#myblogs .newpost {
margin: 0px 0 5px 0;
......@@ -874,7 +887,7 @@ table#installer {
float: right;
}
#myblogs .blogsettings {
margin: 10px 0 5px 0;
margin: 10px 0 10px 0;
}
#myblogs .addicon a,
#myblogs .addicon a:link,
......@@ -891,7 +904,7 @@ table#installer {
height: 24px;
color: #eef7d4;
font-weight: bold;
padding: 4px 23px 6px 47px;
padding: 5px 23px 4px 47px;
}
#myblogs .blogsettings a,
#myblogs .blogsettings a:link,
......@@ -917,7 +930,7 @@ table#installer {
border: 0;
width: 100px;
height: 24px;
color: #FFFFFF;
color: #eef7d4;
font-size: 11px;
font-weight: bold;
margin: 0;
......@@ -955,9 +968,18 @@ table#installer {
width: 50px;
height: 18px;
padding: 0;
font-weight: normal;
margin: 1px;
}
#attachedfiles tbody input,
#filebrowser tbody input {
background: url(../images/btn_short_short.gif) no-repeat;
width: 50px;
height: 18px;
padding: 0;
font-weight: normal;
margin: 1px;
}
/* My Files styles */
#foldernav {
......@@ -967,16 +989,15 @@ table#installer {
font-size: 15px;
background: url(../images/foldernav.gif) no-repeat;
}
.maincontent #myfiles #filelist tbody tr td,
.maincontent #myfiles #filelist td,
#uploader th {
vertical-align: top;
}
.maincontent #myfiles #filelist tbody tr td a,
.maincontent #filebrowser tbody tr td a {
.maincontent #myfiles #filelist td a,
.maincontent #filebrowser td a {
font-weight: bold;
}
.maincontent #filebrowser input /*,
.maincontent #myfiles #filelist input*/ {
.maincontent #filebrowser input {
background: url(../images/btn_short_short.gif) no-repeat;
width: 50px;
height: 18px;
......@@ -984,13 +1005,17 @@ table#installer {
margin: 1px;
border: none;
}
#uploader #uploadform table {
padding: 5px 10px;
.maincontent #uploader #uploadform table {
background-color: #f4f8e7;
border: 0;
}
.maincontent #myfiles #createfolderform table {
.maincontent #uploader #uploadform table th,
.maincontent #uploader #uploadform table td,
.maincontent #myfiles #createfolderform table th,
.maincontent #myfiles #createfolderform table td {
padding: 5px 10px;
}
.maincontent #myfiles #createfolderform table {
background-color: #e3ecc2;
border: 0;
}
......@@ -1094,7 +1119,7 @@ table#installer {
background: url(../images/btn_createview_medium.gif) no-repeat;
width: 90px;
height: 18px;
color: #568023;
color: #eef7d4;
margin: 3px 1px 3px 1px;
padding: 0;
font-weight: normal;
......@@ -1103,7 +1128,8 @@ table#installer {
}
#viewlist tbody tr td {
padding: 1px 4px;
border: 1px solid #f2f5e7;
background: #f2f5e7;
vertical-align: text-top;
}
#viewlist tbody a,
#viewlist tbody a:link,
......@@ -1126,9 +1152,17 @@ table#installer {
margin: 0 0 15px 15px;
}
.maincontent #tree {
color: #3a5813;
color: #819f18;
font-size: 15px;
font-weight: bold;
border-right: 1px solid #9d9d9d;
overflow: auto;
padding: 5px;
margin: 0;
}
.maincontent #tree ul li {
line-height: 20px;
padding: 0;
}
.maincontent #tree ul {
font-size: 13px;
......@@ -1146,53 +1180,45 @@ table#installer {
.maincontent #tree ul ul {
font-size: 11px;
font-weight: normal;
margin: 0 0 10px 20px;
}
.maincontent #tree ul ul ul {
margin: 0 0 10px 20px;
margin: 0 0 10px 20px;
}
.maincontent #tree a,
.maincontent #tree a:link,
.maincontent #tree a:active,
.maincontent #tree a:visited,
.maincontent #tree a:hover {
padding: 0;
margin: 2px 0 0 0;
.maincontent #template {
margin: 0;
padding: 0 0 0 5px;
}
.maincontent #template td {
vertical-align: top;
padding: 0;
}
/* spacing for the little 'x' */
.maincontent #template #tpl_blog1 ul li a,
.maincontent #template #tpl_blog1 ul li a:link,
.maincontent #template #tpl_blog1 ul li a:active,
.maincontent #template #tpl_blog1 ul li a:visited,
.maincontent #template #tpl_blog1 ul li a:hover,
.maincontent #template #tpl_blog2 ul li a,
.maincontent #template #tpl_blog2 ul li a:link,
.maincontent #template #tpl_blog2 ul li a:active,
.maincontent #template #tpl_blog2 ul li a:visited,
.maincontent #template #tpl_blog2 ul li a:hover,
.maincontent #template #tpl_profile ul li a,
.maincontent #template #tpl_profile ul li a:link,
.maincontent #template #tpl_profile ul li a:active,
.maincontent #template #tpl_profile ul li a:visited,
.maincontent #template #tpl_profile ul li a:hover {
.maincontent #template ul li a,
.maincontent #template ul li a:link,
.maincontent #template ul li a:active,
.maincontent #template ul li a:visited,
.maincontent #template ul li a:hover {
padding: 0 0 0 5px;
}
.maincontent #template #tpl_blog1 p,
.maincontent #template #tpl_blog1 span,
.maincontent #template #tpl_blog2 p,
.maincontent #template #tpl_blog2 span,
.maincontent #template #tpl_profile p,
.maincontent #template #tpl_profile span,
.maincontent #template #tpl_files1 p,
.maincontent #template #tpl_files1 span ,
.maincontent #template #tpl_files2 p,
.maincontent #template #tpl_files2 span,
.maincontent #template #tpl_files3 p,
.maincontent #template #tpl_files3 span {
.maincontent #template p {
padding: 0;
margin: 0;
}
.maincontent #template ul {
margin: 0;
}
.maincontent #template ul li {
background: url(../images/icon_arrow_short.gif) no-repeat left;
padding: 0 0 0 10px;
list-style: none;
}
.maincontent #template .clickable {
color: #5c8727;
background: url(../images/icon_arrow_short.gif) no-repeat left;
padding: 0 0 0 10px;
margin: 0;
list-style: none;
}
/*.maincontent #template p,
.maincontent #template span {
font-size: 11px;
font-style: italic;
color: #666666;
......@@ -1202,16 +1228,12 @@ table#installer {
.maincontent #template #tpl_blog1 ul,
.maincontent #template #tpl_blog2 ul {
color: #5c8727;
}
.maincontent #template #tpl_blogslabel em,
.maincontent #template #tpl_profilelabel em,
.maincontent #template #tpl_fileslabel1 em,
.maincontent #template #tpl_fileslabel2 em,
.maincontent #template #tpl_fileslabel3 em,
.maincontent #template #tpl_freelabel em {
}*/
.maincontent #template em {
font-size: 11px;
font-style: italic;
color: #5c8727;
display: inline;
}
#template .block {
background: #eef7d4;
......@@ -1228,9 +1250,10 @@ span.block_potential, div.block_potential {
span.block_targetted, div.block_targetted {
border: 2px solid #c2e167;
}
.moveselected {
background: #eef7d4 url(../images/icon_arrow.gif) no-repeat right;
padding: 0 20px 0 2px;
padding: 0 12px 0 0;
}
.clickable {
cursor: pointer;
......@@ -1258,30 +1281,34 @@ span.block_targetted, div.block_targetted {
}
#viewacl_lhs {
margin: 0 53px 0 53px;
margin: 0 0 0 50px;
float: left;
border-right: 1px solid #9d9d9d;
padding: 5px;
}
#viewacl_lhs #potentialpresetitems {
color: #5c8727;
font-weight: bold;
padding: 0 0 3px 0;
text-align: right;
width: 160px;
margin: 0 0 0 -53px;
width: 132px;
margin: 0 0 0 -51px;
}
#editviewaccess #editviewaccess_accesslist_container,
#createview4 #createview4_accesslist_container {
color: #5c8727;
font-weight: bold;
width: 750px;
}
#dosearch {
background: url(../images/btn_go.gif) no-repeat;
width: 33px;
height: 18px;
border: none;
color: #FFFFFF;
color: #eef7d4;
font-size: 11px;
font-weight: bold;
margin: 0;
margin: 0 0 0 2px;
padding: 0;
}
#editviewaccess #results,
......@@ -1290,50 +1317,55 @@ span.block_targetted, div.block_targetted {
margin: 3px 0 15px 0;
font-weight: normal;
color: #000000;
width: 405px;
}
#results button {
background: url(../images/btn_short_green.gif) no-repeat;
border: 0;
width: 33px;
height: 18px;
color: #FFFFFF;
color: #eef7d4;
font-size: 9px;
margin: 0 0 0 5px;
padding: 0;
}
#accesslistitems {
float: right;
padding: 5px;
}
#accesslistitems div {
background-color: #e5e8da;
padding: 5px 7px;
padding: 5px 7px 1px 7px;
color: #000000;
margin: 0 0 10px 0px;
margin: 0 0 5px 0;
line-height: 20px;
font-weight: normal;
font-size: 13px;
width: 230px;
}
#potentialpresetitems button,
#accesslistitems button {
background: url(../images/btn_createview.gif) no-repeat;
#accesslistitems div div {
background: none;
}
#potentialpresetitems button {
background: url(../images/btn_short_green.gif) no-repeat;
border: 0;
width: 60px;
width: 33px;
height: 18px;
color: #FFFFFF;
color: #eef7d4;
font-size: 9px;
margin: 2px 2px 2px 5px;
padding: 0;
}
#accesslistitems div {
margin: 0 0 5px 0;
}
#editviewaccess_submit_container #editviewaccess_submit {
background: url(../images/btn_long_off.gif) no-repeat;
#accesslistitems button {
background: url(../images/btn_short_short.gif) no-repeat;
border: 0;
width: 200px;
height: 24px;
color: #FFFFFF;
width: 50px;
height: 18px;
color: #eef7d4;
font-size: 9px;
margin: 0;
margin: 2px 2px 2px 5px;
padding: 0;
}
}
/* My Account styles */
.maincontent #accountprefs #accountprefs_friendscontrol_container label,
......@@ -1342,6 +1374,16 @@ span.block_targetted, div.block_targetted {
font-weight: normal;
color: #000000;
}
.maincontent #accountprefs #accountprefs_friendscontrol_container .contextualHelp {
padding: 0 3px;
margin: 0;
vertical-align: bottom;
}
.maincontent #accountprefs #accountprefs_friendscontrol_container .contextualHelp p {
padding: 3px;
margin: 0;
background-color: #f4f7e8;
}
.maincontent #accountprefs #accountprefs_submit_container td {
padding: 10px 0 0 0;
}
......@@ -1382,6 +1424,30 @@ span.block_targetted, div.block_targetted {
}
/* Administration Home styles */
#adminhome ul {
margin: 0;
list-style: none;
}
#adminhome ul ul li {
background: url(../images/icon_arrow.gif) no-repeat left;
padding: 0 0 0 25px;
}
#runupgrade {
align: right;
padding: 10px;
background-color: #f4f7e8;
border: 1px solid #e5e8da;
}
#runupgrade a {
color: #eef7d4;
font-weight: bold;
background: url(../images/btn_upgrade.gif) no-repeat;
width: 130px;
height: 24px;
padding: 4px 24px 7px 30px;
}
/* Configure Site styles */
.maincontent #siteoptions table td {
width: 200px;
......@@ -1406,39 +1472,83 @@ span.block_targetted, div.block_targetted {
background-color: #e5e8da;
padding: 3px;
}
#menuitemlist td input.button {
background: url(../images/btn_short_short.gif) no-repeat;
width: 50px;
height: 18px;
padding: 0;
margin: 1px;
}