diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index fcdde75..3be0484 100755 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -27,7 +27,7 @@ class UsersController < ApplicationController current_user.update_attributes(params[:user].reject { |k| k == ("password" || "password_confirmation") }) pass = params[:user][:password] current_user.password = pass if !(pass.blank?) - current_user.save! + flash[:success] = "Account Updated!" if current_user.save! redirect_to user_account_settings_path(:user_id => current_user.user_id) end diff --git a/public/assets/1-4125f191a8b1c0af0e0ed6de7ccd7ac4.jpg b/public/assets/1-4125f191a8b1c0af0e0ed6de7ccd7ac4.jpg new file mode 100755 index 0000000..7926830 Binary files /dev/null and b/public/assets/1-4125f191a8b1c0af0e0ed6de7ccd7ac4.jpg differ diff --git a/public/assets/1.jpg b/public/assets/1.jpg new file mode 100755 index 0000000..7926830 Binary files /dev/null and b/public/assets/1.jpg differ diff --git a/public/assets/2-25f8e8f4f18872206f3800f16d7dfcbe.jpg b/public/assets/2-25f8e8f4f18872206f3800f16d7dfcbe.jpg new file mode 100755 index 0000000..ed60c05 Binary files /dev/null and b/public/assets/2-25f8e8f4f18872206f3800f16d7dfcbe.jpg differ diff --git a/public/assets/2.jpg b/public/assets/2.jpg new file mode 100755 index 0000000..ed60c05 Binary files /dev/null and b/public/assets/2.jpg differ diff --git a/public/assets/3-e154bbe5f28637a837011ee3cdf59400.jpg b/public/assets/3-e154bbe5f28637a837011ee3cdf59400.jpg new file mode 100755 index 0000000..d852848 Binary files /dev/null and b/public/assets/3-e154bbe5f28637a837011ee3cdf59400.jpg differ diff --git a/public/assets/3.jpg b/public/assets/3.jpg new file mode 100755 index 0000000..d852848 Binary files /dev/null and b/public/assets/3.jpg differ diff --git a/public/assets/4-962373fb07da63a676ade578f80e9c91.jpg b/public/assets/4-962373fb07da63a676ade578f80e9c91.jpg new file mode 100755 index 0000000..1a1a2c6 Binary files /dev/null and b/public/assets/4-962373fb07da63a676ade578f80e9c91.jpg differ diff --git a/public/assets/4.jpg b/public/assets/4.jpg new file mode 100755 index 0000000..1a1a2c6 Binary files /dev/null and b/public/assets/4.jpg differ diff --git a/public/assets/alpha-932f5a0406e65532a0a6fd4f7228bddb.png b/public/assets/alpha-932f5a0406e65532a0a6fd4f7228bddb.png new file mode 100755 index 0000000..38043f1 Binary files /dev/null and b/public/assets/alpha-932f5a0406e65532a0a6fd4f7228bddb.png differ diff --git a/public/assets/alpha.png b/public/assets/alpha.png new file mode 100755 index 0000000..38043f1 Binary files /dev/null and b/public/assets/alpha.png differ diff --git a/public/assets/application-bbdcb4ca193350fe8addc3b0bb014c3a.js b/public/assets/application-bbdcb4ca193350fe8addc3b0bb014c3a.js new file mode 100644 index 0000000..eb6b6bf --- /dev/null +++ b/public/assets/application-bbdcb4ca193350fe8addc3b0bb014c3a.js @@ -0,0 +1,573 @@ +/*! + * jQuery JavaScript Library v1.9.1 + * http://jquery.com/ + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * + * Copyright 2005, 2012 jQuery Foundation, Inc. and other contributors + * Released under the MIT license + * http://jquery.org/license + * + * Date: 2013-2-4 + */ +function snippetPopup(e){top.consoleRef=window.open("","myconsole","width=600,height=300,left=50,top=50,menubar=0,toolbar=0,location=0,status=0,scrollbars=1,resizable=1"),top.consoleRef.document.writeln("Snippet :: Code View :: "+location.href+""+''+"
"+e+"
"+""),top.consoleRef.document.close()}function sh_isEmailAddress(e){return/^mailto:/.test(e)?!1:-1!==e.indexOf("@")}function sh_setHref(e,t,n){var i=n.substring(e[t-2].pos,e[t-1].pos);i.length>=2&&"<"===i.charAt(0)&&">"===i.charAt(i.length-1)&&(i=i.substr(1,i.length-2)),sh_isEmailAddress(i)&&(i="mailto:"+i),e[t-2].node.href=i}function sh_konquerorExec(e){var t=[""];return t.index=e.length,t.input=e,t}function sh_highlightString(e,t){if(/Konqueror/.test(navigator.userAgent)&&!t.konquered){for(var n=0;t.length>n;n++)for(var i=0;t[n].length>i;i++){var r=t[n][i][0];"$"===r.source&&(r.exec=sh_konquerorExec)}t.konquered=!0}var s=document.createElement("a"),o=document.createElement("span"),a=[],l=0,c=[],h=0,u=null,d=function(t,n){var i=t.length;if(0!==i){if(!n){var r=c.length;if(0!==r){var d=c[r-1];d[3]||(n=d[1])}}if(u!==n&&(u&&(a[l++]={pos:h},"sh_url"===u&&sh_setHref(a,l,e)),n)){var f;f="sh_url"===n?s.cloneNode(!1):o.cloneNode(!1),f.className=n,a[l++]={node:f,pos:h}}h+=i,u=n}},f=/\r\n|\r|\n/g;f.lastIndex=0;for(var p=e.length;p>h;){var g,m,y=h,v=f.exec(e);null===v?(g=p,m=p):(g=v.index,m=f.lastIndex);for(var b=e.substring(y,g),w=[];;){var _,x=h-y,C=c.length;_=0===C?0:c[C-1][2];var T=t[_],E=T.length,k=w[_];k||(k=w[_]=[]);for(var N=null,A=-1,S=0;E>S;S++){var D;if(k.length>S&&(null===k[S]||k[S].index>=x))D=k[S];else{var M=T[S][0];M.lastIndex=x,D=M.exec(b),k[S]=D}if(null!==D&&(null===N||D.indexx&&d(b.substring(x,N.index),null);var R,L=T[A],z=L[1];if(z instanceof Array)for(var O=0;z.length>O;O++)R=N[O+1],d(R,z[O]);else R=N[0],d(R,z);switch(L[2]){case-1:break;case-2:c.pop();break;case-3:c.length=0;break;default:c.push(L)}}u&&(a[l++]={pos:h},"sh_url"===u&&sh_setHref(a,l,e),u=null),h=m}return a}function sh_getClasses(e){var t=[],n=e.className;if(n&&n.length>0)for(var i=n.split(" "),r=0;i.length>r;r++)i[r].length>0&&t.push(i[r]);return t}function sh_addClass(e,t){for(var n=sh_getClasses(e),i=0;n.length>i;i++)if(t.toLowerCase()===n[i].toLowerCase())return;n.push(t),e.className=n.join(" ")}function sh_extractTagsFromNodeList(e,t){for(var n=e.length,i=0;n>i;i++){var r=e.item(i);switch(r.nodeType){case 1:if("br"===r.nodeName.toLowerCase()){var s;s=/MSIE/.test(navigator.userAgent)?"\r":"\n",t.text.push(s),t.pos++}else t.tags.push({node:r.cloneNode(!1),pos:t.pos}),sh_extractTagsFromNodeList(r.childNodes,t),t.tags.push({pos:t.pos});break;case 3:case 4:t.text.push(r.data),t.pos+=r.length}}}function sh_extractTags(e,t){var n={};return n.text=[],n.tags=t,n.pos=0,sh_extractTagsFromNodeList(e.childNodes,n),n.text.join("")}function sh_mergeTags(e,t){var n=e.length;if(0===n)return t;var i=t.length;if(0===i)return e;for(var r=[],s=0,o=0;n>s&&i>o;){var a=e[s],l=t[o];a.pos<=l.pos?(r.push(a),s++):(r.push(l),t[o+1].pos<=a.pos?(o++,r.push(t[o]),o++):(r.push({pos:a.pos}),t[o]={node:l.node.cloneNode(!1),pos:a.pos}))}for(;n>s;)r.push(e[s]),s++;for(;i>o;)r.push(t[o]),o++;return r}function sh_insertTags(e,t){for(var n=document,i=document.createDocumentFragment(),r=0,s=e.length,o=0,a=t.length,l=i;a>o||s>r;){var c,h;if(s>r?(c=e[r],h=c.pos):h=a,o>=h){if(c.node){var u=c.node;l.appendChild(u),l=u}else l=l.parentNode;r++}else l.appendChild(n.createTextNode(t.substring(o,h))),o=h}return i}function sh_highlightElement(e,t){sh_addClass(e,"sh_sourceCode");for(var n=[],i=sh_extractTags(e,n),r=sh_highlightString(i,t),s=sh_mergeTags(n,r),o=sh_insertTags(s,i);e.hasChildNodes();)e.removeChild(e.firstChild);e.appendChild(o)}function sh_getXMLHttpRequest(){if(window.ActiveXObject)return new ActiveXObject("Msxml2.XMLHTTP");if(window.XMLHttpRequest)return new XMLHttpRequest;throw"No XMLHttpRequest implementation available"}function sh_load(language,element,prefix,suffix){if(language in sh_requests)return sh_requests[language].push(element),void 0;sh_requests[language]=[element];var request=sh_getXMLHttpRequest(),url=prefix+"sh_"+language+suffix;request.open("GET",url,!0),request.onreadystatechange=function(){if(4===request.readyState)try{if(request.status&&200!==request.status)throw"HTTP error: status "+request.status;eval(request.responseText);for(var elements=sh_requests[language],i=0;elements.length>i;i++)sh_highlightElement(elements[i],sh_languages[language])}finally{request=null}},request.send(null)}function sh_highlightDocument(e,t){for(var n=document.getElementsByTagName("pre"),i=0;n.length>i;i++){var r=n.item(i),s=r.className.toLowerCase(),o=s.replace(/sh_sourcecode/g,"");if(-1!=o.indexOf("sh_")&&(o=o.match(/(\bsh_)\w+\b/g)[0]),-1==s.indexOf("sh_sourcecode")&&"sh_"===o.substr(0,3)){var a=o.substring(3);if(a in sh_languages)sh_highlightElement(r,sh_languages[a]);else{if("string"!=typeof e||"string"!=typeof t){console.log('Found
 element with class="'+o+'", but no such language exists');continue}sh_load(a,r,e,t)}break}}}function rubyCodeFormat(){$("pre.ruby").snippet("ruby",{style:"rand01",transparent:!0,showNum:!0})}(function(e,t){function n(e){var t=e.length,n=lt.type(e);return lt.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}function i(e){var t=Ct[e]={};return lt.each(e.match(ht)||[],function(e,n){t[n]=!0}),t}function r(e,n,i,r){if(lt.acceptData(e)){var s,o,a=lt.expando,l="string"==typeof n,c=e.nodeType,h=c?lt.cache:e,u=c?e[a]:e[a]&&a;if(u&&h[u]&&(r||h[u].data)||!l||i!==t)return u||(c?e[a]=u=J.pop()||lt.guid++:u=a),h[u]||(h[u]={},c||(h[u].toJSON=lt.noop)),("object"==typeof n||"function"==typeof n)&&(r?h[u]=lt.extend(h[u],n):h[u].data=lt.extend(h[u].data,n)),s=h[u],r||(s.data||(s.data={}),s=s.data),i!==t&&(s[lt.camelCase(n)]=i),l?(o=s[n],null==o&&(o=s[lt.camelCase(n)])):o=s,o}}function s(e,t,n){if(lt.acceptData(e)){var i,r,s,o=e.nodeType,l=o?lt.cache:e,c=o?e[lt.expando]:lt.expando;if(l[c]){if(t&&(s=n?l[c]:l[c].data)){lt.isArray(t)?t=t.concat(lt.map(t,lt.camelCase)):t in s?t=[t]:(t=lt.camelCase(t),t=t in s?[t]:t.split(" "));for(i=0,r=t.length;r>i;i++)delete s[t[i]];if(!(n?a:lt.isEmptyObject)(s))return}(n||(delete l[c].data,a(l[c])))&&(o?lt.cleanData([e],!0):lt.support.deleteExpando||l!=l.window?delete l[c]:l[c]=null)}}}function o(e,n,i){if(i===t&&1===e.nodeType){var r="data-"+n.replace(Et,"-$1").toLowerCase();if(i=e.getAttribute(r),"string"==typeof i){try{i="true"===i?!0:"false"===i?!1:"null"===i?null:+i+""===i?+i:Tt.test(i)?lt.parseJSON(i):i}catch(s){}lt.data(e,n,i)}else i=t}return i}function a(e){var t;for(t in e)if(("data"!==t||!lt.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function l(){return!0}function c(){return!1}function h(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function u(e,t,n){if(t=t||0,lt.isFunction(t))return lt.grep(e,function(e,i){var r=!!t.call(e,i,e);return r===n});if(t.nodeType)return lt.grep(e,function(e){return e===t===n});if("string"==typeof t){var i=lt.grep(e,function(e){return 1===e.nodeType});if(Zt.test(t))return lt.filter(t,i,!n);t=lt.filter(t,i)}return lt.grep(e,function(e){return lt.inArray(e,t)>=0===n})}function d(e){var t=Ut.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function f(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function p(e){var t=e.getAttributeNode("type");return e.type=(t&&t.specified)+"/"+e.type,e}function g(e){var t=sn.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function m(e,t){for(var n,i=0;null!=(n=e[i]);i++)lt._data(n,"globalEval",!t||lt._data(t[i],"globalEval"))}function y(e,t){if(1===t.nodeType&<.hasData(e)){var n,i,r,s=lt._data(e),o=lt._data(t,s),a=s.events;if(a){delete o.handle,o.events={};for(n in a)for(i=0,r=a[n].length;r>i;i++)lt.event.add(t,n,a[n][i])}o.data&&(o.data=lt.extend({},o.data))}}function v(e,t){var n,i,r;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!lt.support.noCloneEvent&&t[lt.expando]){r=lt._data(t);for(i in r.events)lt.removeEvent(t,i,r.handle);t.removeAttribute(lt.expando)}"script"===n&&t.text!==e.text?(p(t).text=e.text,g(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),lt.support.html5Clone&&e.innerHTML&&!lt.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&tn.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}function b(e,n){var i,r,s=0,o=typeof e.getElementsByTagName!==V?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==V?e.querySelectorAll(n||"*"):t;if(!o)for(o=[],i=e.childNodes||e;null!=(r=i[s]);s++)!n||lt.nodeName(r,n)?o.push(r):lt.merge(o,b(r,n));return n===t||n&<.nodeName(e,n)?lt.merge([e],o):o}function w(e){tn.test(e.type)&&(e.defaultChecked=e.checked)}function _(e,t){if(t in e)return t;for(var n=t.charAt(0).toUpperCase()+t.slice(1),i=t,r=En.length;r--;)if(t=En[r]+n,t in e)return t;return i}function x(e,t){return e=t||e,"none"===lt.css(e,"display")||!lt.contains(e.ownerDocument,e)}function C(e,t){for(var n,i,r,s=[],o=0,a=e.length;a>o;o++)i=e[o],i.style&&(s[o]=lt._data(i,"olddisplay"),n=i.style.display,t?(s[o]||"none"!==n||(i.style.display=""),""===i.style.display&&x(i)&&(s[o]=lt._data(i,"olddisplay",N(i.nodeName)))):s[o]||(r=x(i),(n&&"none"!==n||!r)&<._data(i,"olddisplay",r?n:lt.css(i,"display"))));for(o=0;a>o;o++)i=e[o],i.style&&(t&&"none"!==i.style.display&&""!==i.style.display||(i.style.display=t?s[o]||"":"none"));return e}function T(e,t,n){var i=vn.exec(t);return i?Math.max(0,i[1]-(n||0))+(i[2]||"px"):t}function E(e,t,n,i,r){for(var s=n===(i?"border":"content")?4:"width"===t?1:0,o=0;4>s;s+=2)"margin"===n&&(o+=lt.css(e,n+Tn[s],!0,r)),i?("content"===n&&(o-=lt.css(e,"padding"+Tn[s],!0,r)),"margin"!==n&&(o-=lt.css(e,"border"+Tn[s]+"Width",!0,r))):(o+=lt.css(e,"padding"+Tn[s],!0,r),"padding"!==n&&(o+=lt.css(e,"border"+Tn[s]+"Width",!0,r)));return o}function k(e,t,n){var i=!0,r="width"===t?e.offsetWidth:e.offsetHeight,s=un(e),o=lt.support.boxSizing&&"border-box"===lt.css(e,"boxSizing",!1,s);if(0>=r||null==r){if(r=dn(e,t,s),(0>r||null==r)&&(r=e.style[t]),bn.test(r))return r;i=o&&(lt.support.boxSizingReliable||r===e.style[t]),r=parseFloat(r)||0}return r+E(e,t,n||(o?"border":"content"),i,s)+"px"}function N(e){var t=X,n=_n[e];return n||(n=A(e,t),"none"!==n&&n||(hn=(hn||lt("