', '
');
+if ($message) {
+ print '';
+ print $message;
+ print '
';
+}
+?>
+
+ 'profile-form', 'class' => 'logg-form content-inner center'));
print '';
print anchor('edge_user/change_password','Change Password', array('class'=>'logg-button','title'=>'Change Your Password'));
- //print anchor('project','View Projects', array('class'=>'logg-button','title'=>'View List Of Projects'));
+ //print anchor('project','View Projects', array('class'=>'logg-button','title'=>'View List Of Projects'));
if ($is_admin) {
print anchor('a', 'A', array('style'=>'visibility:hidden;'));
print anchor('admin', 'Admin', array('class'=>'logg-button','title'=>'Admin'));
}
- print anchor('edge_user/logout', 'Logout', array('class'=>'logg-button right','title'=>'Logout'));
+ print anchor('edge_user/logout', 'Logout', array('class'=>'logg-button right','title'=>'Logout'));
?>
-
-
-
-
-
- - -
-
-
- -
+ -
Profile Info
+-
-
- Profile Info
-▼
-
-
+
';
- }
- ?>
+ Profile Info
+ +
+
+ Profile Info
+▼
+
+
';
- print ' Is Active ?';
-
- print ' ';
- $admin_checked=empty($user_details['is_admin']) ? null:'checked';
- print '';
- print ' Allow Administration Access ?';
-
- print '
+ print ' />'; - '; - print '
';
- print 'Swipe Card ID:
'; - print ''; - - $identification_id=empty($user_details['identification_id']) ? null:$user_details['identification_id']; - print ''; + if ($is_admin) { + $active_checked=empty($user_details['active']) ? null:'checked'; + print ''; + print ' Is Active ?'; + + print ' '; + $admin_checked=empty($user_details['is_admin']) ? null:'checked'; + print ''; + print ' Allow Administration Access ?'; + + print 'Swipe Card ID:
'; + print ' - -Username:
- - -First name:
- - -Last name:
- - -Email:
- - - -+ print ' />'; - '; - print '
▼
';
- print '';
- //print '';
- print 'User Groups
'; - print '';
- print '
+ '; + print '
';
+ print 'Groups that Edge User Belongs To
'; - //if (isset($user_details['groups']) && isset($groups)) { + $identification_id=empty($user_details['identification_id']) ? null:$user_details['identification_id']; + print ''; + } + ?> + +Username:
+ + +First name:
+ + +Last name:
+ + +Email:
+ + + ++ '; + print '
▼
';
+ print '';
+ print 'User Groups
'; + print '';
+ print '';
foreach($groups as $group_id=>$group_name) {
@@ -100,306 +100,202 @@
print ''; // group-item
}
print '
'; // group-list
- //}
+ print '
';
+ }
+ ?>
- print 'Groups that Edge User Belongs To
'; $users_groups=empty($user_details['groups'])?array():$user_details['groups']; - + print '-
- - -
-
-
+
+
- -
-
- -
What are you up to at The Edge today?
++
What are you up to at The Edge today?
-
-
+
- value="" />
-
- I'm busy, don't disturb me
-- - -
-
- ▼
-
-
- Just hanging out today, come talk to me!
-
-
+ My background / interests / hobbies
+ value="" /> +I'm busy, don't disturb me
++ +
+
+ ▼
+
+
+ Just hanging out today, come talk to me!
+
+
- -
+ +
My background / interests / hobbies
+
$interest) {
- print '';
- print '' . $interest . ' ';
- print ' '; // interest-item
- }
- print ''; // interest-list
- }
-
+ print $profile['interests'];
?>
-
-
-
-
-
-
- | - - | -- - | -- |
-
-
- -
-
- ▼
-
-
- I am happy to share my skills!
-
-
+
+
+
+ Skills I can share with other Edge users
+| + | ++ | ++ |
+
+
+ + +
+
+ ▼
+
+
+ I am happy to share my skills!
+ +
+
- - - -
Skills I can share with other Edge users
+ +
';
-
- print '';
- print '' . $expertise['expertise'] . ' ';
- print ' '; // interest-item
+ if (isset($user_details['expertises'])) {
+ print '';
+
+ foreach($user_details['expertises'] as $expertise) {
+ print '
'; // interest-list
+ print '';
+ print '
-
-
-
-
- | ' . $expertise['expertise'] . ' | '; + print '
| - - | -- - | -- |
-
-
- - - -
-
+
+
+
+ +
@@ -29,9 +29,9 @@
The Edge RFID Checkin
-
-
-
+
+
+
▼
-
-
- I need your help ...
+| + | ++ | ++ |
+
-
-
+
+ I need someone's help with ...
- (My project ideas / questions) ++ +
+
+ ▼
+
+
+ I need your help ...
+
+
- - -
- - -
diff --git a/userprofile/codeigniter_application/views/templates/header.php b/userprofile/codeigniter_application/views/templates/header.php
index a00b4c8..69b15ca 100644
--- a/userprofile/codeigniter_application/views/templates/header.php
+++ b/userprofile/codeigniter_application/views/templates/header.php
@@ -2,23 +2,23 @@
- I need someone's help with ...
+ (My project ideas / questions) +
';
- foreach($user_details['questions'] as $question) {
- print '';
- print '' . $question['question'] . ' ';
- print ' '; // interest-item
- }
- print ''; // interest-list
+ print '';
+ print '' . $question['question'] . ' ';
+ print ' '; // interest-item
}
-
+ print ''; // interest-list
+ }
?>
-
-
-
-
-
- | - - | -- |
-
-
- - -
-
-
- I'm new here, and don't really know what The Edge is about yet ...
-- - -
-
-
+
+
+
- - - - 'logg-button','title'=>'View List Of Projects')); - ?> -
\ No newline at end of file
+ 'logg-button','title'=>'View List Of Projects'));
+ ?>
+ Other status message:
- - +| + | ++ |
+
- - - - - 'logg-button','title'=>'View List Of Projects')); - ?> -
-
-
-
-
+
+
+
+
diff --git a/userprofile/include/.gitignore b/userprofile/include/.gitignore
new file mode 100644
index 0000000..7b13fa1
--- /dev/null
+++ b/userprofile/include/.gitignore
@@ -0,0 +1 @@
+/jquery-ui-1.8.21.custom.zip
diff --git a/userprofile/include/js/rfid_edge_common.js b/userprofile/include/js/rfid_edge_common.js
index a7d00c3..4ca9a31 100644
--- a/userprofile/include/js/rfid_edge_common.js
+++ b/userprofile/include/js/rfid_edge_common.js
@@ -1,7 +1,11 @@
$(document).ready(function() {
-
-
-
+
+ //Get the clicked button
+ var submitButton = undefined;
+ $('#profile-form').find(':submit').live('mouseup keyup',function(){
+ submitButton = $(this);
+ });
+
// hide all but .collapse-nohide on load, change arrows
$('.collapse-head').each(function(index) {
var content_name = '#' + $(this).attr('id') + '-content';
@@ -33,7 +37,6 @@ $(document).ready(function() {
});
-
// toggle content
$(document).on('click', '.collapse-head', function(event) {
if ($(this).is('[click-on-click]')) {
@@ -102,6 +105,33 @@ $(document).ready(function() {
return false;
}
});
+
+ /* Handle User Profile Updates */
+
+ /* attach a submit handler to the form */
+ $("#profile-form").submit(function(event) {
+
+ /* stop form from submitting normally */
+ event.preventDefault();
+
+ var submitButtonName=submitButton.attr('name');
+ console.log(submitButtonName);
+ /* get some values from elements on the page: */
+ var $form = $( this ), url = $form.attr( 'action' );
+
+ /* Send the data using post and put the results in a div */
+ if (submitButtonName == "interest_update") {
+ $.ajax({type:'POST',url:url, data:$("#profile-form").serialize(),
+ success:function(response) {
+ // log the response to the console
+ console.log("Response: "+response);
+ $( '#interest_list' ).html(response);
+ $('#new_interest').val(null);
+ $("select#new_interest_level option").each(function() { this.selected = (this.text == '1'); });
+ }
+ }
+ );
+ }
+ });
-});
-
+});
\ No newline at end of file