OSEP: OU wiki - basic redesign #105099

moodleou · Feb 1, 2016 · a793f56 · a793f56
1 parent 6d47524
commit a793f56
Show file tree

Hide file tree

Showing 13 changed files with 511 additions and 237 deletions.
diff --git a/annotate.php b/annotate.php
@@ -312,10 +312,13 @@
 $customdata[2] = $pagename;
 $customdata[3] = $userid;
 $customdata[4] = has_capability('mod/ouwiki:lock', $context);
+echo html_writer::start_div('ouw-annotation-list');
 echo html_writer::tag('h2', get_string('annotations', 'ouwiki'));
+echo html_writer::end_div();
 
 $annotateform = new mod_ouwiki_annotate_form('annotate.php?id='.$id, $customdata);
 $annotateform->display();
+echo $ouwikioutput->get_bottom_buttons($subwiki, $cm, $context, $pageversion, true);
 
 $usedannotations = array();
 foreach ($annotations as $annotation) {

diff --git a/annotate_form.php b/annotate_form.php
@@ -42,7 +42,8 @@ public function definition() {
             $editnumber = 1;
             foreach ($annotations as $annotation) {
                 if (!$annotation->orphaned) {
-                    $mform->addElement('textarea', 'edit'.$annotation->id, $editnumber, array('cols'=>'40', 'rows'=>'3'));
+                    $mform->addElement('textarea', 'edit'.$annotation->id, '(' . $editnumber . ')',
+                            array('cols'=>'40', 'rows'=>'3'));
                     $mform->setDefault('edit'.$annotation->id, $annotation->content);
                     $editnumber++;
                 } else {

diff --git a/edit.php b/edit.php
@@ -427,7 +427,6 @@
 
 // print the preview box
 if ($content) {
-    $ouwikioutput = $PAGE->get_renderer('mod_ouwiki');
     echo $ouwikioutput->ouwiki_print_preview($content, $pagename, $subwiki, $cm, $pageversion->xhtmlformat);
     $existing = $content;
 }
@@ -477,6 +476,8 @@
 
 $mform->display();
 
+echo $ouwikioutput->get_bottom_buttons($subwiki, $cm, $context, $pageversion, false);
+
 $stringlist = array(
         array('savefailnetwork', 'ouwiki'),
         array('savefailtitle', 'ouwiki'),

diff --git a/history.php b/history.php
@@ -132,7 +132,8 @@
 <form name='ouw_history' class='ouw_history' method='get' action='history.php'>
 <input type='hidden' name='compare' value='1'/>
 $wikiinputs
-<table>
+<table class='generaltable'>
+<thead>
 <tr><th scope='col'>".get_string('date')."</th><th scope='col'>".get_string('time')."</th><th><span class='accesshide'>".get_string('actionheading', 'ouwiki')."</span>
 </th>";
 if ($ouwiki->enablewordcount) {
@@ -142,7 +143,7 @@
     print '<th scope="col">'.get_string('importedfrom', 'ouwiki').'</th>';
 }
 print "<th scope='col'>".get_string('changedby', 'ouwiki')."</th><th scope='col'><span class='accesshide'>".get_string('compare', 'ouwiki')."</span></th>";
-print '</tr>';
+print '</thead></tr><tbody>';
 
 $lastdate = '';
 $changeindex = 0;
@@ -247,9 +248,11 @@
     $changeindex++;
 }
 
-print "
-<tr><td colspan='5' class='comparebutton'><input id='ouw_comparebutton' type='submit' value='".get_string('compareselected', 'ouwiki')."' /></td></tr>
-</table></form>";
+print "</tbody></table>";
+$input = '<input id="ouw_comparebutton" type="submit" value="' .
+        get_string('compareselected', 'ouwiki') . '" class="osep-smallbutton" />';
+echo html_writer::div($input, 'ouw-comparebutton-wrapper');
+print "</form>";
 
 // The page works without JS. If you do have it, though, this script ensures
 // you can't click compare without having two versions selected.
@@ -272,12 +275,10 @@ function ouw_check() {
 </script>
 ';
 
-$a = new stdClass();
-$a->atom = $atomurl;
-$a->rss = $rssurl;
-print '<p class="ouw_subscribe"><a href="'.$atomurl.'" title="'.get_string('feedalt', 'ouwiki').
-    '"><img src="'.$OUTPUT->pix_url('rss', 'ouwiki').'" alt=""/></a> <span>'.
-    get_string('feedsubscribe', 'ouwiki', $a).'</span></p>';
+echo $ouwikioutput->ouwiki_get_feeds($atomurl, $rssurl);
+
+$pageversion = ouwiki_get_current_page($subwiki, $pagename);
+echo $ouwikioutput->get_bottom_buttons($subwiki, $cm, $context, $pageversion, false);
 
 // Footer
 ouwiki_print_footer($course, $cm, $subwiki, $pagename);
diff --git a/lang/en/ouwiki.php b/lang/en/ouwiki.php
@@ -289,6 +289,7 @@
 $string['add']='Add';
 $string['typeinsectionname']='Type section title here';
 $string['addnewsection']='Add new section to this page';
+$string['addnewsection1']='Add new section';
 $string['createdbyon'] = 'created by {$a->name} on {$a->date}';
 
 $string['numedits'] = '{$a} edits';

diff --git a/locallib.php b/locallib.php
@@ -2281,7 +2281,7 @@ function ouwiki_display_create_page_form($subwiki, $cm, $pageversion) {
     $result .= '<label for="ouw_newsectionname">' . get_string('addnewsection', 'ouwiki') . '</label> ' .
             '<input type="text" size="30" name="newsection" id="ouw_newsectionname" value="" />' .
             '<input type="submit" id="ouw_add" name="ouw_subb" value="' .
-            get_string('add', 'ouwiki').'" />' .
+            get_string('add', 'ouwiki').'" class="osep-smallbutton" />' .
             '</div></form></li>';
 
     // Create new page.
@@ -2290,7 +2290,7 @@ function ouwiki_display_create_page_form($subwiki, $cm, $pageversion) {
             '<label for="ouw_newpagename">' . get_string('createnewpage', 'ouwiki') . '</label> '.
             '<input type="text" name="page" id="ouw_newpagename" size="30" value="" />' .
             '<input type="submit" id="ouw_create" name="ouw_subb" value="' .
-            get_string('create', 'ouwiki') . '" />' .
+            get_string('create', 'ouwiki') . '" class="osep-smallbutton" />' .
             '</div></form></li>';
 
     $result .= '</ul></div>';

diff --git a/participation.php b/participation.php
@@ -105,5 +105,7 @@
 
 // Footer
 if (empty($download)) {
+    $pageversion = ouwiki_get_current_page($subwiki, $pagename);
+    echo $ouwikioutput->get_bottom_buttons($subwiki, $cm, $context, $pageversion, false);
     ouwiki_print_footer($course, $cm, $subwiki, $pagename, null, 'view');
 }