Changes to formfactor and canvas
authorPatrick Malley <ptrkmkl@newschoollearning.com>
Wed, 28 Apr 2010 02:58:56 +0000 (02:58 +0000)
committerPatrick Malley <ptrkmkl@newschoollearning.com>
Wed, 28 Apr 2010 02:58:56 +0000 (02:58 +0000)
theme/canvas/config.php
theme/canvas/style/blocks.css [new file with mode: 0644]
theme/canvas/style/core.css
theme/canvas/style/mods.css [new file with mode: 0644]
theme/formfactor/config.php
theme/formfactor/layout/frontpage.php
theme/formfactor/layout/general.php
theme/formfactor/style/blocks.css [new file with mode: 0644]
theme/formfactor/style/core.css
theme/formfactor/style/mods.css [new file with mode: 0644]

index bc18706..0d102fb 100644 (file)
@@ -19,7 +19,7 @@ $THEME->parents = array('base');
 // changes you want to your theme.
 ////////////////////////////////////////////////////
 
-$THEME->sheets = array('pagelayout', 'text', 'course', 'core');
+$THEME->sheets = array('pagelayout', 'text', 'core', 'course', 'mods', 'blocks');
 
 ////////////////////////////////////////////////////
 // Name of the stylesheet(s) you've including in 
diff --git a/theme/canvas/style/blocks.css b/theme/canvas/style/blocks.css
new file mode 100644 (file)
index 0000000..a125e15
--- /dev/null
@@ -0,0 +1,4 @@
+.block_action .reloadnavigation { margin-right: 3px }
+
+.block_calendar_month .minicalendar th,
+.block_calendar_month .minicalendar td { border-color: #ddd; border-style: dotted;border-width: 1px; }
\ No newline at end of file
index 46bc755..324136a 100644 (file)
@@ -1,3 +1,24 @@
 .sitetopic { border:none; }
 
 .headingblock { border-bottom:1px solid #ddd;font-size:1.3em;color:#333; }
+
+.singlebutton,
+.singleselect  { text-align:center;margin:1em 0; }
+
+/* Login 
+-------------------------*/
+
+.loginbox {margin:15px 25%;}
+.loginbox .loginerrors { color: #f00; }
+.loginbox .loginform { margin: 15px auto 0;width:175px; }
+.loginbox .loginform .form-label {float:none;width:100%;margin:0 auto;text-align: left;}
+.loginbox .loginform .form-input {float: none;width:100%;margin: 0 auto;}
+.loginbox .loginform .form-input #username,
+.loginbox .loginform .form-input #password { width:97%;padding: 3px;font-size: 1.1em;font-family: Helvetica, Arial, sans-serif;border: 2px solid #ddd;margin: 0 0 5px;color: #333; }
+.loginbox .loginform .form-input #loginbtn { margin: 0.5em auto; }
+.loginbox .forgetpass { margin:1em 0 0;font-size: 0.95em;}
+.loginbox.twocolumns {width:90%;margin-left:5%;}
+.loginbox .guestsub {border-top:1px solid #DDDDDD;margin:5px 20%}
+.loginbox.twocolumns .loginpanel { border-color:#ddd;padding-right:0.5%; }
+.loginbox.twocolumns .signuppanel { padding-left:1%;width:49%; }
+
diff --git a/theme/canvas/style/mods.css b/theme/canvas/style/mods.css
new file mode 100644 (file)
index 0000000..7cf462d
--- /dev/null
@@ -0,0 +1,9 @@
+#intro { border-color:#ddd;margin:2% 10%;padding:10px; }
+
+/* Forums 
+-------------------------*/
+
+.path-mod-forum .forumheaderlist { border-color:#ddd;border-collapse:collapse; }
+.path-mod-forum .forumheaderlist td { border-color:#ddd; }
+.path-mod-forum .forumheaderlist th { text-align:left;border-right:1px solid #ddd; }
+.path-mod-forum .forumheaderlist .replies { text-align:center; }
\ No newline at end of file
index 03764c8..6bcff4d 100644 (file)
@@ -21,7 +21,7 @@ $THEME->parents = array('canvas','base');
 ////////////////////////////////////////////////////
 
 
-$THEME->sheets = array('core', 'course', 'selected');
+$THEME->sheets = array('core', 'course', 'mods', 'blocks', 'selected');
 
 ////////////////////////////////////////////////////
 // Name of the stylesheet(s) you've including in 
@@ -45,86 +45,72 @@ $THEME->editor_sheets = array('editor');
 
 $THEME->layouts = array(
     'base' => array(
-        'theme' => 'formfactor',
         'file' => 'general.php',
         'regions' => array('side-pre', 'side-post'),
         'defaultregion' => 'side-post',
     ),
     'general' => array(
-        'theme' => 'formfactor',
         'file' => 'general.php',
         'regions' => array('side-pre', 'side-post'),
         'defaultregion' => 'side-post',
     ),
     'course' => array(
-        'theme' => 'formfactor',
         'file' => 'general.php',
         'regions' => array('side-pre', 'side-post'),
         'defaultregion' => 'side-post'
     ),
     'coursecategory' => array(
-        'theme' => 'formfactor',
         'file' => 'general.php',
         'regions' => array('side-pre', 'side-post'),
         'defaultregion' => 'side-post',
     ),
     'incourse' => array(
-        'theme' => 'formfactor',
         'file' => 'general.php',
         'regions' => array('side-pre', 'side-post'),
         'defaultregion' => 'side-post',
     ),
     'frontpage' => array(
-        'theme' => 'formfactor',
         'file' => 'frontpage.php',
         'regions' => array('side-pre', 'side-post'),
         'defaultregion' => 'side-post',
     ),
     'admin' => array(
-        'theme' => 'formfactor',
         'file' => 'general.php',
         'regions' => array('side-pre'),
         'defaultregion' => 'side-pre',
     ),
     'mydashboard' => array(
-        'theme' => 'formfactor',
         'file' => 'general.php',
         'regions' => array('side-pre', 'side-post'),
         'defaultregion' => 'side-post',
         'options' => array('langmenu'=>true),
     ),
     'mypublic' => array(
-        'theme' => 'formfactor',
         'file' => 'general.php',
         'regions' => array('side-pre', 'side-post'),
         'defaultregion' => 'side-post',
     ),
     'login' => array(
-        'theme' => 'formfactor',
         'file' => 'general.php',
         'regions' => array(),
         'options' => array('langmenu'=>true),
     ),
     'popup' => array(
-        'theme' => 'formfactor',
         'file' => 'general.php',
         'regions' => array(),
         'options' => array('nofooter'=>true),
     ),
     'frametop' => array(
-        'theme' => 'formfactor',
         'file' => 'general.php',
         'regions' => array(),
         'options' => array('nofooter'=>true),
     ),
     'maintenance' => array(
-        'theme' => 'formfactor',
         'file' => 'general.php',
         'regions' => array(),
         'options' => array('nofooter'=>true, 'nonavbar'=>true),
     ),
     'embedded' => array(
-       'theme' => 'formfactor',
         'file' => 'embedded.php',
         'regions' => array(),
         'options' => array('nofooter'=>true, 'nonavbar'=>true),
index df77e66..b8002fb 100644 (file)
@@ -42,7 +42,7 @@ echo $OUTPUT->doctype() ?>
     
     <ul id="page-navigation" class="clearfix">
        <li id="first"><a href="<?php echo $CFG->wwwroot; ?>" title="Home">Home</a></li>
-       <li><a href="<?php echo $CFG->wwwroot; ?>" title="Courses">Courses</a></li>
+       <li><a href="<?php echo $CFG->wwwroot; ?>/course/index.php" title="Courses">Courses</a></li>
     </ul>
     
 <!-- END OF HEADER -->
index 495c1f7..06318ee 100644 (file)
@@ -26,27 +26,44 @@ echo $OUTPUT->doctype() ?>
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
+
 <?php if ($hasheading || $hasnavbar) { ?>
-    <div id="page-header">
-        <?php if ($hasheading) { ?>
-        <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
-        <div class="headermenu"><?php
-            echo $OUTPUT->login_info();
-            if (!empty($PAGE->layout_options['langmenu'])) {
-                echo $OUTPUT->lang_menu();
-            }
-            echo $PAGE->headingmenu
-        ?></div><?php } ?>
-        <?php if ($hasnavbar) { ?>
-            <div class="navbar clearfix">
-                <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
-                <div class="navbutton"> <?php echo $PAGE->button; ?></div>
-            </div>
-        <?php } ?>
+
+    <div id="page-header" class="clearfix">
+               <div id="page-header-wrapper">
+               
+               <?php if ($hasheading) { ?>
+                       <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
+                   <div class="headermenu">
+                               <?php
+                               echo $OUTPUT->login_info();
+                                       if (!empty($PAGE->layout_options['langmenu'])) {
+                                       echo $OUTPUT->lang_menu();
+                                   }
+                               echo $PAGE->headingmenu
+                               ?>
+                       </div>
+               <?php } ?>        
+               
+           </div>
     </div>
+
+    <ul id="page-navigation" class="clearfix">
+       <li id="first"><a href="<?php echo $CFG->wwwroot; ?>" title="Home">Home</a></li>
+       <li><a href="<?php echo $CFG->wwwroot; ?>" title="Courses">Courses</a></li>
+    </ul>
+    
+    <?php if ($hasnavbar) { ?>
+           <div class="navbar clearfix">
+           <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
+            <div class="navbutton"> <?php echo $PAGE->button; ?></div>
+        </div>
+    <?php } ?>
+    
 <?php } ?>
 <!-- END OF HEADER -->
 
+<div id="page-content-wrapper">
     <div id="page-content">
         <div id="region-main-box">
             <div id="region-post-box">
@@ -78,6 +95,7 @@ echo $OUTPUT->doctype() ?>
             </div>
         </div>
     </div>
+</div>
 
 <!-- START OF FOOTER -->
     <?php if ($hasfooter) { ?>
diff --git a/theme/formfactor/style/blocks.css b/theme/formfactor/style/blocks.css
new file mode 100644 (file)
index 0000000..7d73180
--- /dev/null
@@ -0,0 +1,14 @@
+.sideblock { border-width:1px 0 0;border-color:#ccc;border-style:solid;background:url([[pix:theme|gradient-sb]]) repeat-x 0 0;}
+.sideblock .header { border-width:0 1px;border-style:solid;border-color:#eee;;padding:3px 10px; }
+.sideblock .header h2 { color:#333;font-size:1.2em; }
+.sideblock .content { padding:5px 10px;border-color:#eee;border-width:0 1px 1px;border-style:solid; }
+
+.block_login { border:1px solid #ccc;background:#fcffc8; }
+.block_login label { font-size:0.85em;display:block; }
+.block_login .fld input { margin:1px 0 5px;padding:2px;width:95%; }
+.block_login .btn { padding:4px 0; }
+.block_login .footer { font-size:0.9em;padding:5px 0 3px; }
+
+.block_calendar_month .content  { padding: 5px }
+
+.block_course_summary .content { padding:10px; }
\ No newline at end of file
index e0a1513..1295717 100644 (file)
@@ -3,43 +3,35 @@ body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea { font-family: "Trebuchet MS",
 /* Header 
 -------------------------*/
 
-#page-header-wrapper { margin:0 4%; }
+#page-header-wrapper { margin:0 50px; }
 
 #page-header { float:none; }
-#page-header .headermain { margin:0.75em 0; }
+#page-header .headermain { margin:0.75em 0;font-size:2em; }
+#page-header .headermenu a:hover { color:#fff; }
+
 
 #page-site-index .headermain { margin:0.85em 0;font-size:2.5em; }
 
 /* Menu Navigation 
 --------------------------*/
 
-#page-navigation { margin:0;padding:0 4%; }
+#page-navigation { margin:0;padding:0 40px;font-size:1.1em; }
 #page-navigation li { list-style:none;float:left; }
 #page-navigation a { display:block;padding:5px 10px; }
-#page-navigation #first a { padding-left:0; }
 
-/* Content 
+/* Breadcrumb 
 ---------------------------*/
 
-#page-content-wrapper { margin:10px 4%; }
+.navbar { padding:3px 50px; }
+.navbar .breadcrumb { font-size:0.8em;color:#555; }
 
-/* Sideblocks 
+/* Content 
 ---------------------------*/
 
-.sideblock { border-width:1px 0 0;border-color:#ccc;border-style:solid;background:url([[pix:theme|gradient-sb]]) repeat-x 0 0;}
-.sideblock .header { border-width:0 1px;border-style:solid;border-color:#eee;;padding:3px 10px; }
-.sideblock .header h2 { color:#333;font-size:1.2em; }
-.sideblock .content { padding:5px 10px;border-color:#eee;border-width:0 1px 1px;border-style:solid; }
-.block_login { border:1px solid #ccc;background:#fcffc8; }
+#page-content-wrapper { margin:10px 50px; }
 
-/* Forum
----------------------------*/
+/* Footer
+--------------------------*/
 
-.forumpost { border:none; }
-.forumpost .left { background:none; }
-.forumpost .topic { background:#eee;border-color:#aaa;border-width:0 0 2px 0;padding-left:7px; }
-.forumpost .topic .subject { font-size:1.25em; }
-.forumpost .topic .author { font-style:italic;color:#444;font-size:0.95em; }
-.forumpost .content { border-bottom:5px solid #aaa;padding:5px 7px 10px 7px; }
-.forumpost .content .commands,
-.forumpost .content .link { font-size:0.9em; }
+#page-footer { margin:25px 0; }
+#page-footer .logininfo  { margin: 1em 0; }
\ No newline at end of file
diff --git a/theme/formfactor/style/mods.css b/theme/formfactor/style/mods.css
new file mode 100644 (file)
index 0000000..379b4e7
--- /dev/null
@@ -0,0 +1,15 @@
+#intro { background:#f7f7f7; }
+
+/* Forum
+---------------------------*/
+
+.path-mod-forum .forumheaderlist th {background: url([[pix:theme|gradient-sb]]) repeat-x 0 0}
+.path-mod-forum .forumheaderlist .r1 td { background:#f5f5f5; }
+
+.forumpost { border:none; }
+.forumpost .topic { background:#eee;border-color:#aaa;border-width:0 0 2px 0;padding-left:7px; }
+.forumpost .topic .subject { font-size:1.25em; }
+.forumpost .topic .author { font-style:italic;color:#444;font-size:0.95em; }
+.forumpost .content { border-bottom:5px solid #aaa;padding:5px 7px 10px 7px; }
+.forumpost .content .commands,
+.forumpost .content .link { font-size:0.9em; }