Changeset 147

Timestamp:

08/27/10 18:24:31 (18 months ago)

Author:

gnum

Message:

Fixes #94, all of mentioned forms now have a cancel button.

Location:

trunk/views/default

Files:

• edufeedr/css.php (modified) (1 diff)
• edufeedr/forms/edit_assignment.php (modified) (2 diffs)
• edufeedr/forms/edit_educourse.php (modified) (2 diffs)
• edufeedr/forms/join_educourse.php (modified) (2 diffs)
• input/edufeedr_cancel.php (added)

trunk/views/default/edufeedr/css.php

@@ -270 +270 @@
     display: none;
 }
+
+.edufeedr_cancel_button {
+        background: none repeat scroll 0 0 #CCCCCC !important;
+        border: 1px solid #CCCCCC !important;
+    color: #333333 !important;
+}

trunk/views/default/edufeedr/forms/edit_assignment.php

@@ -38 +38 @@
 
                 $submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save')));
+        // Cancel button
+        $cancel_href = $vars['url'] . 'pg/edufeedr/view_educourse/' . $vars['entity']->getGUID() . '?filter=assignments';
+        $cancel_input = elgg_view('input/edufeedr_cancel', array('value' => elgg_echo('cancel'), 'href' => $cancel_href));
+
                 $entity_hidden = elgg_view('input/hidden', array('internalname' => 'educourse', 'value' => $vars['entity']->getGUID()));
                 if (isset($vars['assignment']))
@@ -67 +71 @@
                         $entity_hidden
             $submit_input
+            $cancel_input
         </p>
 EOT;

trunk/views/default/edufeedr/forms/edit_educourse.php

@@ -111 +111 @@
 
 
-    $submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save')));
+        $submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save')));
+        // Cancel button
+        $cancel_href = $vars['url'] . 'pg/edufeedr/index';
+        if (isset($vars['entity'])) {
+                $cancel_href = $vars['url'] . 'pg/edufeedr/view_educourse/' . $vars['entity']->getGUID();
+        }
+        $cancel_input = elgg_view('input/edufeedr_cancel', array('value' => elgg_echo('cancel'), 'href' => $cancel_href));
+
     if(isset($vars['entity'])) {
         $entity_hidden = elgg_view('input/hidden', array('internalname' => 'educourse', 'value' => $vars['entity']->getGUID()));
@@ -154 +161 @@
     <p>
         $entity_hidden
-        $submit_input
+                $submit_input
+                $cancel_input
     </p>
 EOT;

trunk/views/default/edufeedr/forms/join_educourse.php

@@ -58 +58 @@
                 /*translation:Sign up*/
                 $submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('edufeedr:submit:signup')));
+        // Cancel button
+        $cancel_href = $vars['url'] . 'pg/edufeedr/view_educourse/' . $vars['entity']->getGUID();
+        if (isset($vars['participant'])) {
+            $cancel_href = $vars['url'] . 'pg/edufeedr/view_educourse/' . $vars['entity']->getGUID() . '?filter=participants';
+        }
+        $cancel_input = elgg_view('input/edufeedr_cancel', array('value' => elgg_echo('cancel'), 'href' => $cancel_href));
+
                 $entity_hidden = elgg_view('input/hidden', array('internalname' => 'educourse', 'value' => $vars['entity']->getGUID()));
                 if (isset($vars['participant_id']))
@@ -89 +96 @@
                 <p>
                         $entity_hidden
-            $submit_input
+                        $submit_input
+                        $cancel_input
         </p>
 EOT;