L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-38751-master' of git://github.com/FMCorz/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2013-04-04 01:07:23 +02:00
parent 5c98b64b00 5581c618fc
commit 33871fbf3e
22 changed files with 193 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/form/cancel.php
+7
View File
@@ -62,6 +62,13 @@ class MoodleQuickForm_cancel extends MoodleQuickForm_submit
}
MoodleQuickForm_submit::MoodleQuickForm_submit($elementName, $value, $attributes);
$this->updateAttributes(array('onclick'=>'skipClientValidation = true; return true;'));
// Add the class btn-cancel.
$class = $this->getAttribute('class');
if (empty($class)) {
$class = '';
}
$this->updateAttributes(array('class' => $class . ' btn-cancel'));
}
/**
theme/afterburner/style/afterburner_styles.css
+12
View File
@@ -479,3 +479,15 @@ tab styles for ie6 & ie7
body#page-course-view-topics.path-course div.moodle-dialogue-base div.yui3-widget{
z-index: 600!important;
}
/* Moodle forms
----------------*/
.mform .btn-cancel {
color: #007EBA;
text-decoration: none;
}
.mform .btn-cancel:hover, .mform .btn-cancel:focus {
color: #cc3300;
text-decoration: underline;
}
theme/anomaly/style/base.css
+12
View File
@@ -184,3 +184,15 @@ h6.main {
.theme_description h2 {
padding-top: 0.5em;
}
/* Moodle forms
----------------*/
.mform .btn-cancel {
color: #697F55;
text-decoration: none;
}
.mform .btn-cancel:hover, .mform .btn-cancel:focus {
color: #697F55;
text-decoration: underline;
}
theme/arialist/style/core.css
+12
View File
@@ -308,3 +308,15 @@ h2.headingblock {
#custommenu .custom_menu_submenu .custom_menu_submenu .yui3-menu-content {
border-top:1px solid #DDD;
}
/* Moodle forms
----------------*/
.mform .btn-cancel {
color: #F25F0F;
text-decoration: none;
}
.mform .btn-cancel:hover, .mform .btn-cancel:focus {
color: #333333;
text-decoration: none;
}
theme/base/style/core.css
+5
View File
@@ -302,6 +302,11 @@ a.skip:active {position: static;display: block;}
.dir-rtl.jsenabled .mform fieldset.collapsed {border-width: 1px 1px 0 0; }
.dir-rtl .mform .fitem fieldset.felement {padding-right: 1%;margin-right: 15%;}
.mform .btn-cancel, .mform .btn-cancel:active, .mform .btn-cancel[disabled] { background-color: transparent; background-image: none; box-shadow: none; -moz-box-shadow: none; -webkit-box-shadow: none; -o-box-shadow: none; -ms-box-shadow: none; margin-left: .5em;}
.mform .btn-cancel { border-color: transparent; border-radius: 0 0 0 0; -moz-border-radius: 0 0 0 0; -webkit-border-radius: 0 0 0 0; -o-border-radius: 0 0 0 0; -ms-border-radius: 0 0 0 0; color: #0088CC; cursor: pointer; }
.mform .btn-cancel:hover, .mform .btn-cancel:focus { background-color: transparent; color: #005580; text-decoration: underline; }
.mform .btn-cancel[disabled]:hover, .mform .btn-cancel[disabled]:focus { color: #333333; text-decoration: none; }
input#id_externalurl {direction:ltr;}
/** Browser corrections for mforms **/
theme/binarius/style/core.css
+12
View File
@@ -321,3 +321,15 @@ body.has_dock {
.pagelayout-redirect #content p,
.pagelayout-redirect #content div {color:#FFF;}
/* Moodle forms
----------------*/
.mform .btn-cancel {
color: #F14E16;
text-decoration: none;
}
.mform .btn-cancel:hover, .mform .btn-cancel:focus {
color: #FB961C;
text-decoration: none;
}
theme/boxxie/style/core.css
+9
View File
@@ -52,6 +52,15 @@ a:active {
padding: 0 5px;
}
.mform .btn-cancel {
color: #69804E;
text-decoration: none;
}
.mform .btn-cancel:hover, .mform .btn-cancel:focus {
color: #41512f;
text-decoration: none;
}
.generalbox {
border-color: #e5e5e5;
padding: 5px;
theme/brick/style/core.css
+8
View File
@@ -161,6 +161,14 @@ blockquote {
background: #fff;
}
.mform .btn-cancel {
color: #06365B;
text-decoration: none;
}
.mform .btn-cancel:hover, .mform .btn-cancel:focus {
color: #5487AD;
text-decoration: none;
}
div.navbar {
border-bottom: 1px solid #eee;
theme/canvas/style/core.css
+9
View File
@@ -509,6 +509,15 @@ input[type="radio"] {
margin:0;
}
.mform .btn-cancel {
color: #0000EE;
text-decoration: none;
}
.mform .btn-cancel:hover, .mform .btn-cancel:focus {
color: #0000EE;
text-decoration: none;
}
/* Comments
-----------------------*/
theme/formal_white/style/core.css
+9
View File
@@ -150,6 +150,15 @@ textarea {
margin-top:0;
}
.mform .btn-cancel {
color: #000000;
text-decoration: none;
}
.mform .btn-cancel:hover, .mform .btn-cancel:focus {
color: #000000;
text-decoration: underline;
}
/* Redirect
-----------------------*/
.pagelayout-redirect #content {margin-bottom:10%;}
theme/formfactor/style/core.css
+2
View File
@@ -48,6 +48,8 @@ body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea { font-family: "Trebuchet MS",
.mform fieldset {border-color: #ddd;}
.mform legend {border: 1px solid #ddd;padding: 2px 7px;background: url([[pix:theme|gradient-sb]]) repeat-x 0 -25%;}
.mform .btn-cancel { color: #BF3503; text-decoration: none; }
.mform .btn-cancel:hover, .mform .btn-cancel:focus { color: #3f5c10; text-decoration: none; }
/* Footer
--------------------------*/
theme/fusion/style/core.css
+12
View File
@@ -48,6 +48,18 @@ blockquote {
color:#666;
}
/* Moodle forms
----------------*/
.mform .btn-cancel {
color: #2d83d5;
text-decoration: none;
}
.mform .btn-cancel:hover, .mform .btn-cancel:focus {
color: #333333;
text-decoration: none;
}
.mform fieldset {
border-color: #eee;
}
theme/leatherbound/style/core.css
+12
View File
@@ -351,3 +351,15 @@ h2.headingblock {
#custommenu .yui3-menu.javascript-disabled .yui3-menu-content .ul {
border-width:0;
}
/* Moodle forms
----------------*/
.mform .btn-cancel {
color: #DA5013;
text-decoration: none;
}
.mform .btn-cancel:hover, .mform .btn-cancel:focus {
color: #251c17;
text-decoration: none;
}
theme/magazine/style/core.css
+9
View File
@@ -817,6 +817,15 @@ div.subscribelink {
background: #f9f9f9;
}
.mform .btn-cancel {
color: #32529A;
text-decoration: none;
}
.mform .btn-cancel:hover, .mform .btn-cancel:focus {
color: #4E2300;
text-decoration: none;
}
.ftoggler {
font-size: 18px;
color: #333333;
theme/nimble/style/core.css
+12 -1
View File
@@ -223,4 +223,15 @@ h2.headingblock {
#page-footer {
margin-bottom: 25px;
}
}
/* Moodle forms
----------------*/
.mform .btn-cancel {
color: #2A65B1;
text-decoration: none;
}
.mform .btn-cancel:hover, .mform .btn-cancel:focus {
color: #000000;
text-decoration: none;
}
theme/nonzero/style/core.css
+11
View File
@@ -221,5 +221,16 @@ a:active {
border-width:0;
}
/* Moodle forms
----------------*/
.mform .btn-cancel {
color: #27608d;
text-decoration: none;
}
.mform .btn-cancel:hover, .mform .btn-cancel:focus {
color: #000000;
text-decoration: none;
}
/** Custom CSS **/
[[setting:customcss]]
theme/overlay/style/core.css
+12 -1
View File
@@ -287,4 +287,15 @@ h1.headermain {
}
/** Dock **/
#dock .firstdockitem {margin-top: 30px;}
#dock .firstdockitem {margin-top: 30px;}
/* Moodle forms
----------------*/
.mform .btn-cancel {
color: #428AB5;
text-decoration: none;
}
.mform .btn-cancel:hover, .mform .btn-cancel:focus {
color: #428AB5;
text-decoration: none;
}
theme/serenity/style/core.css
+11
View File
@@ -309,4 +309,15 @@ body.has_dock {
#page-mod-quiz-edit .questionbankwindow.block div.header {
background-color: #9EB1BF;
padding-top: 0;
}
/* Moodle forms
----------------*/
.mform .btn-cancel {
color: #336688;
text-decoration: none;
}
.mform .btn-cancel:hover, .mform .btn-cancel:focus {
color: #336688;
text-decoration: underline;
}
theme/sky_high/style/core.css
+9
View File
@@ -337,3 +337,12 @@ body.has_dock {
padding:4px;
}
/* @end */
.mform .btn-cancel {
color: #003466;
text-decoration: none;
}
.mform .btn-cancel:hover, .mform .btn-cancel:focus {
color: #4785ac;
text-decoration: none;
}
theme/splash/style/core.css
+5
View File
@@ -185,6 +185,11 @@ body.lang-vi {
padding:20px;
text-align:center;
}
.mform .btn-cancel,
.mform .btn-cancel:hover, .mform .btn-cancel:focus {
color: #853650;
text-decoration: underline;
}
/* html editor fixed width
-------------------------*/
textarea#id_summary_editor {width:420px;}
theme/standard/style/core.css
+2
View File
@@ -219,6 +219,8 @@ form.popupform label {margin-right: 0.5em;}
.mform .fitem fieldset.felement {margin-top:0;padding-top:0;margin-bottom:0;padding-bottom:0;}
.mform .fpassword .unmask input {margin-left:5px;margin-right:3px;}
#page-admin-register .mform .fsubmit {padding:20px;text-align:center;}
.mform .btn-cancel {color: #0000ff;}
.mform .btn-cancel:hover, .mform .btn-cancel:focus {color: #ff0000;}
/**
* Filters
theme/upgrade.txt
+1
View File
@@ -8,6 +8,7 @@ DOM changes:
* new setting $THEME->yuicssmodules = array('cssreset', 'cssfonts', 'cssgrids', 'cssbase'); which
allows themes to use different CSS reset normalisers such as cssnormalize YUI module
* Re-wrote the user profile views to definition lists.
* Cancel buttons have the class btn-cancel.
Renderer changes:
* Mymobile theme changed to support more verbose move-block-here descriptions.