From eb892361cc4c5fdb7daa0a4b8cd0a1ca8a8d39c4 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Thu, 26 Feb 2015 10:41:33 -0500 Subject: [PATCH] Work on courses Adding sortable and the accordion from jquery ui --- Toolkit/Members/Admin/EditCourses.php | 7 +- Toolkit/Members/RecordNavigation.php | 8 +- Toolkit/Members/css/member-admin.css | 7 + Toolkit/Members/libjs/edit-member-course.js | 32 ++-- Toolkit/Members/templates/editCourse.tpl | 182 ++++++++++---------- Toolkit/Members/templates/editCourses.tpl | 11 +- 6 files changed, 133 insertions(+), 114 deletions(-) diff --git a/Toolkit/Members/Admin/EditCourses.php b/Toolkit/Members/Admin/EditCourses.php index 8777baf..356c315 100644 --- a/Toolkit/Members/Admin/EditCourses.php +++ b/Toolkit/Members/Admin/EditCourses.php @@ -1047,6 +1047,7 @@ class EditAdminCourse extends Toolkit_FormBuilder * @access protected */ protected $courseId; + protected $courseName; /** * Description for protected @@ -1168,10 +1169,7 @@ class EditAdminCourse extends Toolkit_FormBuilder WHERE id = {$this->courseId}"; $defaults = $this->dbh->query($sql)->fetch(PDO::FETCH_ASSOC); - //var_dump($this->courseId); - if ($this->courseId === 10) { - //echo '
'.print_r($defaults, true).'
';exit; - } + $this->courseName = ($defaults['title']) ? 'Course - ' . $defaults['title'] : 'Course'; $defaults['curr_image_rmv'] = $defaults['image']; $img = ''; $defaults['curr_image'] = sprintf($img, MEMBER_PHOTOS . $defaults['image']); @@ -1499,6 +1497,7 @@ class EditAdminCourse extends Toolkit_FormBuilder $this->accept($renderer); $this->view = new stdClass(); $this->view->courseId = $this->courseId; + $this->view->courseName = $this->courseName; $this->view->showCurrImg = $this->showCurrImg; $this->view->showCurrFile = $this->showCurrFile; $this->view->form = $renderer->toObject(); diff --git a/Toolkit/Members/RecordNavigation.php b/Toolkit/Members/RecordNavigation.php index f6e8d0d..9be53b6 100644 --- a/Toolkit/Members/RecordNavigation.php +++ b/Toolkit/Members/RecordNavigation.php @@ -127,9 +127,9 @@ class Toolkit_Members_RecordNavigation 'desc' => "View and edit $singularType categories", ); $nav['courses'] = array( - 'title' => 'Course Profile', + 'title' => 'Course Profiles', 'url' => "/members.php?$params", - 'desc' => "View and edit $singularType Course Profile", + 'desc' => "View and edit $singularType Course Profiles", ); $nav['amenities'] = array( 'title' => 'Amenities', @@ -248,9 +248,9 @@ class Toolkit_Members_RecordNavigation 'desc' => "View and edit $singularType categories", ), 'courses' => array( - 'title' => 'Course Profile', + 'title' => 'Course Profiles', 'url' => "/?$params", - 'desc' => "View and edit $singularType Course Profile", + 'desc' => "View and edit $singularType Course Profiles", ), 'amenities' => array( 'title' => 'Amenities', diff --git a/Toolkit/Members/css/member-admin.css b/Toolkit/Members/css/member-admin.css index c797f7b..ba9a8cb 100755 --- a/Toolkit/Members/css/member-admin.css +++ b/Toolkit/Members/css/member-admin.css @@ -972,3 +972,10 @@ label.pendingUpdate { margin-right: 10px; } .tree li a {background-image: url("../../../images/note_edit.png");} +.ui-icon { + float: left; +} +.ui-accordion-content, .ui-widget-content { + background: none !important; + background-color: #d6dfc3 !important; +} diff --git a/Toolkit/Members/libjs/edit-member-course.js b/Toolkit/Members/libjs/edit-member-course.js index 168d5bb..23d99d0 100755 --- a/Toolkit/Members/libjs/edit-member-course.js +++ b/Toolkit/Members/libjs/edit-member-course.js @@ -17,18 +17,26 @@ var MemberCourses = }); } - $('div.container').sortable({ - placeholder: 'ui-state-highlight', - //handle: 'div.packageItem', - opacity: 0.6, - revert: true, - scroll: true, - tolerance: 'pointer', - zIndex: 5, - axis: 'y', - cursor: 'n-resize', - update: MemberCourses.updatePos - }); + $('#packageList').accordion({ + //active: false, + header: "> div > h3", + collapsible: true, + //icons: false + }) + .sortable({ + placeholder: 'ui-state-highlight', + handle: 'h3', + opacity: 0.6, + revert: true, + scroll: true, + tolerance: 'pointer', + zIndex: 5, + axis: 'y', + cursor: 'n-resize', + update: MemberCourses.updatePos, + cancel: '#courseAddForm' + }); + }, updatePos: function(event, ui) diff --git a/Toolkit/Members/templates/editCourse.tpl b/Toolkit/Members/templates/editCourse.tpl index 569a84e..3575ce5 100644 --- a/Toolkit/Members/templates/editCourse.tpl +++ b/Toolkit/Members/templates/editCourse.tpl @@ -1,106 +1,108 @@ -
- - {form.javascript:h} - {form.outputHeader():h} - {form.hidden:h} -
- {form.title.label:h} -
- {form.title.error:h} +
+

{courseName}

+
+ {form.javascript:h} + {form.outputHeader():h} + {form.hidden:h} +
+ {form.title.label:h} +
+ {form.title.error:h} +
+ {form.title.html:h} + {form.description.label:h} +
+ {form.description.error:h} +
+ {form.description.html:h} + + * + {form.sdate.label:h} + +
+ {form.sdate.error:h} +
+ {form.sdate.html:h} + + * + {form.edate.label:h} + +
+ {form.edate.error:h} +
+ {form.edate.html:h}
- {form.title.html:h} - {form.description.label:h} -
- {form.description.error:h} -
- {form.description.html:h} - - * - {form.sdate.label:h} - -
- {form.sdate.error:h} -
- {form.sdate.html:h} - - * - {form.edate.label:h} - -
- {form.edate.error:h} -
- {form.edate.html:h} -
-
-
- +
+
+ - {form.curr_image.label:h} - {form.curr_image.html:h} + {form.curr_image.label:h} + {form.curr_image.html:h} +
+ {form.image.label:h} +
+ {form.image.error:h} +
+ {form.image.html:h}
- {form.image.label:h} -
- {form.image.error:h} -
- {form.image.html:h} -
-
- {form.res_url.label:h} -
{form.res_url.error:h}
- {form.res_url.html:h} +
+ {form.res_url.label:h} +
{form.res_url.error:h}
+ {form.res_url.html:h} - {form.par.label:h} -
{form.par.error:h}
- {form.par.html:h} + {form.par.label:h} +
{form.par.error:h}
+ {form.par.html:h} - {form.yardage.label:h} -
{form.yardage.error:h}
- {form.yardage.html:h} + {form.yardage.label:h} +
{form.yardage.error:h}
+ {form.yardage.html:h} - {form.course_rating.label:h} -
{form.course_rating.error:h}
- {form.course_rating.html:h} + {form.course_rating.label:h} +
{form.course_rating.error:h}
+ {form.course_rating.html:h} - {form.slope_rating.label:h} -
{form.slope_rating.error:h}
- {form.slope_rating.html:h} + {form.slope_rating.label:h} +
{form.slope_rating.error:h}
+ {form.slope_rating.html:h} - {form.walking_course.label:h} -
{form.walking_course.error:h}
- {form.walking_course.html:h} + {form.walking_course.label:h} +
{form.walking_course.error:h}
+ {form.walking_course.html:h} - {form.holes18.label:h} -
{form.holes18.error:h}
- {form.holes18.html:h} + {form.holes18.label:h} +
{form.holes18.error:h}
+ {form.holes18.html:h} - {form.holes9.label:h} -
{form.holes9.error:h}
- {form.holes9.html:h} + {form.holes9.label:h} +
{form.holes9.error:h}
+ {form.holes9.html:h} -
-
-
- +
+
+
+ - {form.curr_file.label:h} - {form.curr_file.html:h} + {form.curr_file.label:h} + {form.curr_file.html:h} +
+ {form.file.label:h} +
+ {form.file.error:h} +
+ {form.file.html:h}
- {form.file.label:h} -
- {form.file.error:h} +
+ {form.add_rmv.html:h} + {form.remove_rmv.html:h}
- {form.file.html:h} -
-
- {form.add_rmv.html:h} - {form.remove_rmv.html:h} -
- + +
diff --git a/Toolkit/Members/templates/editCourses.tpl b/Toolkit/Members/templates/editCourses.tpl index 65a7a4c..dea67c3 100644 --- a/Toolkit/Members/templates/editCourses.tpl +++ b/Toolkit/Members/templates/editCourses.tpl @@ -18,10 +18,13 @@
{end:}

Courses

- {uploadForm:h}
- {foreach:editForm,i} - {i:h} - {end:} +
+

Add New Course

+ {uploadForm:h} +
+ {foreach:editForm,i} + {i:h} + {end:}
-- 2.17.1