Merge branch 'dev'

a767a86c · gitlabhq · ae47d692 · 5c9cb850 · a767a86c · a767a86c
Commit a767a86c authored Nov 03, 2011 by gitlabhq
71 changed files
--- a/Gemfile
+++ b/Gemfile
@@ -19,6 +19,7 @@ gem "pygments.rb", "0.2.3"
 gem "thin"
 gem "git"
 gem "acts_as_list"
+gem 'rdiscount'
 group :assets do
  gem 'sass-rails', "  ~> 3.1.0"
@@ -26,7 +27,8 @@ group :assets do
  gem 'uglifier'
 end
-group :development do 
+group :development do
+  gem 'letter_opener'
  gem 'rails-footnotes', '>= 3.7.5.rc4'
  gem 'annotate', :git => 'git://github.com/ctran/annotate_models.git'
 end

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -119,6 +119,8 @@ GEM
      rails (>= 3.0.0)
    launchy (2.0.5)
      addressable (~> 2.2.6)
+    letter_opener (0.0.2)
+      launchy
    libv8 (3.3.10.2)
    linecache19 (0.5.12)
      ruby_core_source (>= 0.1.4)
@@ -161,6 +163,7 @@ GEM
      rdoc (~> 3.4)
      thor (~> 0.14.6)
    rake (0.9.2)
+    rdiscount (1.6.8)
    rdoc (3.9.4)
    rspec (2.6.0)
      rspec-core (~> 2.6.0)
@@ -261,9 +264,11 @@ DEPENDENCIES
  jquery-rails
  kaminari
  launchy
+  letter_opener
  pygments.rb (= 0.2.3)
  rails (= 3.1.0)
  rails-footnotes (>= 3.7.5.rc4)
+  rdiscount
  rspec-rails
  ruby-debug19
  sass-rails (~> 3.1.0)

--- a/app/assets/images/.directory
+++ b/app/assets/images/.directory
 [Dolphin]
 ShowPreview=true
-Timestamp=2011,9,14,20,34,18
+Timestamp=2011,10,28,13,16,25
 Version=2
--- a/app/assets/images/bg-header.png
+++ b/app/assets/images/bg-header.png
--- a/app/assets/images/icon-search.png
+++ b/app/assets/images/icon-search.png
--- a/app/assets/images/images.png
+++ b/app/assets/images/images.png
--- a/app/assets/images/login-logo.png
+++ b/app/assets/images/login-logo.png
--- a/app/assets/javascripts/modernizr-2.0.6.min.js
+++ b/app/assets/javascripts/modernizr-2.0.6.min.js
+/* Modernizr 2.0.6 | MIT & BSD
+ * Contains: All core tests, html5shiv, yepnope, respond.js. Get your own custom build at www.modernizr.com/download/
+ */
+;window.Modernizr=function(a,b,c){function I(){e.input=function(a){for(var b=0,c=a.length;b<c;b++)t[a[b]]=a[b]in l;return t}("autocomplete autofocus list placeholder max min multiple pattern required step".split(" ")),e.inputtypes=function(a){for(var d=0,e,f,h,i=a.length;d<i;d++)l.setAttribute("type",f=a[d]),e=l.type!=="text",e&&(l.value=m,l.style.cssText="position:absolute;visibility:hidden;",/^range$/.test(f)&&l.style.WebkitAppearance!==c?(g.appendChild(l),h=b.defaultView,e=h.getComputedStyle&&h.getComputedStyle(l,null).WebkitAppearance!=="textfield"&&l.offsetHeight!==0,g.removeChild(l)):/^(search|tel)$/.test(f)||(/^(url|email)$/.test(f)?e=l.checkValidity&&l.checkValidity()===!1:/^color$/.test(f)?(g.appendChild(l),g.offsetWidth,e=l.value!=m,g.removeChild(l)):e=l.value!=m)),s[a[d]]=!!e;return s}("search tel url email datetime date month week time datetime-local number range color".split(" "))}function G(a,b){var c=a.charAt(0).toUpperCase()+a.substr(1),d=(a+" "+p.join(c+" ")+c).split(" ");return F(d,b)}function F(a,b){for(var d in a)if(k[a[d]]!==c)return b=="pfx"?a[d]:!0;return!1}function E(a,b){return!!~(""+a).indexOf(b)}function D(a,b){return typeof a===b}function C(a,b){return B(o.join(a+";")+(b||""))}function B(a){k.cssText=a}var d="2.0.6",e={},f=!0,g=b.documentElement,h=b.head||b.getElementsByTagName("head")[0],i="modernizr",j=b.createElement(i),k=j.style,l=b.createElement("input"),m=":)",n=Object.prototype.toString,o=" -webkit- -moz- -o- -ms- -khtml- ".split(" "),p="Webkit Moz O ms Khtml".split(" "),q={svg:"http://www.w3.org/2000/svg"},r={},s={},t={},u=[],v=function(a,c,d,e){var f,h,j,k=b.createElement("div");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:i+(d+1),k.appendChild(j);f=["&shy;","<style>",a,"</style>"].join(""),k.id=i,k.innerHTML+=f,g.appendChild(k),h=c(k,a),k.parentNode.removeChild(k);return!!h},w=function(b){if(a.matchMedia)return matchMedia(b).matches;var c;v("@media "+b+" { #"+i+" { position: absolute; } }",function(b){c=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle).position=="absolute"});return c},x=function(){function d(d,e){e=e||b.createElement(a[d]||"div"),d="on"+d;var f=d in e;f||(e.setAttribute||(e=b.createElement("div")),e.setAttribute&&e.removeAttribute&&(e.setAttribute(d,""),f=D(e[d],"function"),D(e[d],c)||(e[d]=c),e.removeAttribute(d))),e=null;return f}var a={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};return d}(),y,z={}.hasOwnProperty,A;!D(z,c)&&!D(z.call,c)?A=function(a,b){return z.call(a,b)}:A=function(a,b){return b in a&&D(a.constructor.prototype[b],c)};var H=function(c,d){var f=c.join(""),g=d.length;v(f,function(c,d){var f=b.styleSheets[b.styleSheets.length-1],h=f.cssRules&&f.cssRules[0]?f.cssRules[0].cssText:f.cssText||"",i=c.childNodes,j={};while(g--)j[i[g].id]=i[g];e.touch="ontouchstart"in a||j.touch.offsetTop===9,e.csstransforms3d=j.csstransforms3d.offsetLeft===9,e.generatedcontent=j.generatedcontent.offsetHeight>=1,e.fontface=/src/i.test(h)&&h.indexOf(d.split(" ")[0])===0},g,d)}(['@font-face {font-family:"font";src:url("https://")}',["@media (",o.join("touch-enabled),("),i,")","{#touch{top:9px;position:absolute}}"].join(""),["@media (",o.join("transform-3d),("),i,")","{#csstransforms3d{left:9px;position:absolute}}"].join(""),['#generatedcontent:after{content:"',m,'";visibility:hidden}'].join("")],["fontface","touch","csstransforms3d","generatedcontent"]);r.flexbox=function(){function c(a,b,c,d){a.style.cssText=o.join(b+":"+c+";")+(d||"")}function a(a,b,c,d){b+=":",a.style.cssText=(b+o.join(c+";"+b)).slice(0,-b.length)+(d||"")}var d=b.createElement("div"),e=b.createElement("div");a(d,"display","box","width:42px;padding:0;"),c(e,"box-flex","1","width:10px;"),d.appendChild(e),g.appendChild(d);var f=e.offsetWidth===42;d.removeChild(e),g.removeChild(d);return f},r.canvas=function(){var a=b.createElement("canvas");return!!a.getContext&&!!a.getContext("2d")},r.canvastext=function(){return!!e.canvas&&!!D(b.createElement("canvas").getContext("2d").fillText,"function")},r.webgl=function(){return!!a.WebGLRenderingContext},r.touch=function(){return e.touch},r.geolocation=function(){return!!navigator.geolocation},r.postmessage=function(){return!!a.postMessage},r.websqldatabase=function(){var b=!!a.openDatabase;return b},r.indexedDB=function(){for(var b=-1,c=p.length;++b<c;)if(a[p[b].toLowerCase()+"IndexedDB"])return!0;return!!a.indexedDB},r.hashchange=function(){return x("hashchange",a)&&(b.documentMode===c||b.documentMode>7)},r.history=function(){return!!a.history&&!!history.pushState},r.draganddrop=function(){return x("dragstart")&&x("drop")},r.websockets=function(){for(var b=-1,c=p.length;++b<c;)if(a[p[b]+"WebSocket"])return!0;return"WebSocket"in a},r.rgba=function(){B("background-color:rgba(150,255,150,.5)");return E(k.backgroundColor,"rgba")},r.hsla=function(){B("background-color:hsla(120,40%,100%,.5)");return E(k.backgroundColor,"rgba")||E(k.backgroundColor,"hsla")},r.multiplebgs=function(){B("background:url(https://),url(https://),red url(https://)");return/(url\s*\(.*?){3}/.test(k.background)},r.backgroundsize=function(){return G("backgroundSize")},r.borderimage=function(){return G("borderImage")},r.borderradius=function(){return G("borderRadius")},r.boxshadow=function(){return G("boxShadow")},r.textshadow=function(){return b.createElement("div").style.textShadow===""},r.opacity=function(){C("opacity:.55");return/^0.55$/.test(k.opacity)},r.cssanimations=function(){return G("animationName")},r.csscolumns=function(){return G("columnCount")},r.cssgradients=function(){var a="background-image:",b="gradient(linear,left top,right bottom,from(#9f9),to(white));",c="linear-gradient(left top,#9f9, white);";B((a+o.join(b+a)+o.join(c+a)).slice(0,-a.length));return E(k.backgroundImage,"gradient")},r.cssreflections=function(){return G("boxReflect")},r.csstransforms=function(){return!!F(["transformProperty","WebkitTransform","MozTransform","OTransform","msTransform"])},r.csstransforms3d=function(){var a=!!F(["perspectiveProperty","WebkitPerspective","MozPerspective","OPerspective","msPerspective"]);a&&"webkitPerspective"in g.style&&(a=e.csstransforms3d);return a},r.csstransitions=function(){return G("transitionProperty")},r.fontface=function(){return e.fontface},r.generatedcontent=function(){return e.generatedcontent},r.video=function(){var a=b.createElement("video"),c=!1;try{if(c=!!a.canPlayType){c=new Boolean(c),c.ogg=a.canPlayType('video/ogg; codecs="theora"');var d='video/mp4; codecs="avc1.42E01E';c.h264=a.canPlayType(d+'"')||a.canPlayType(d+', mp4a.40.2"'),c.webm=a.canPlayType('video/webm; codecs="vp8, vorbis"')}}catch(e){}return c},r.audio=function(){var a=b.createElement("audio"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('audio/ogg; codecs="vorbis"'),c.mp3=a.canPlayType("audio/mpeg;"),c.wav=a.canPlayType('audio/wav; codecs="1"'),c.m4a=a.canPlayType("audio/x-m4a;")||a.canPlayType("audio/aac;")}catch(d){}return c},r.localstorage=function(){try{return!!localStorage.getItem}catch(a){return!1}},r.sessionstorage=function(){try{return!!sessionStorage.getItem}catch(a){return!1}},r.webworkers=function(){return!!a.Worker},r.applicationcache=function(){return!!a.applicationCache},r.svg=function(){return!!b.createElementNS&&!!b.createElementNS(q.svg,"svg").createSVGRect},r.inlinesvg=function(){var a=b.createElement("div");a.innerHTML="<svg/>";return(a.firstChild&&a.firstChild.namespaceURI)==q.svg},r.smil=function(){return!!b.createElementNS&&/SVG/.test(n.call(b.createElementNS(q.svg,"animate")))},r.svgclippaths=function(){return!!b.createElementNS&&/SVG/.test(n.call(b.createElementNS(q.svg,"clipPath")))};for(var J in r)A(r,J)&&(y=J.toLowerCase(),e[y]=r[J](),u.push((e[y]?"":"no-")+y));e.input||I(),e.addTest=function(a,b){if(typeof a=="object")for(var d in a)A(a,d)&&e.addTest(d,a[d]);else{a=a.toLowerCase();if(e[a]!==c)return;b=typeof b=="boolean"?b:!!b(),g.className+=" "+(b?"":"no-")+a,e[a]=b}return e},B(""),j=l=null,a.attachEvent&&function(){var a=b.createElement("div");a.innerHTML="<elem></elem>";return a.childNodes.length!==1}()&&function(a,b){function s(a){var b=-1;while(++b<g)a.createElement(f[b])}a.iepp=a.iepp||{};var d=a.iepp,e=d.html5elements||"abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",f=e.split("|"),g=f.length,h=new RegExp("(^|\\s)("+e+")","gi"),i=new RegExp("<(/*)("+e+")","gi"),j=/^\s*[\{\}]\s*$/,k=new RegExp("(^|[^\\n]*?\\s)("+e+")([^\\n]*)({[\\n\\w\\W]*?})","gi"),l=b.createDocumentFragment(),m=b.documentElement,n=m.firstChild,o=b.createElement("body"),p=b.createElement("style"),q=/print|all/,r;d.getCSS=function(a,b){if(a+""===c)return"";var e=-1,f=a.length,g,h=[];while(++e<f){g=a[e];if(g.disabled)continue;b=g.media||b,q.test(b)&&h.push(d.getCSS(g.imports,b),g.cssText),b="all"}return h.join("")},d.parseCSS=function(a){var b=[],c;while((c=k.exec(a))!=null)b.push(((j.exec(c[1])?"\n":c[1])+c[2]+c[3]).replace(h,"$1.iepp_$2")+c[4]);return b.join("\n")},d.writeHTML=function(){var a=-1;r=r||b.body;while(++a<g){var c=b.getElementsByTagName(f[a]),d=c.length,e=-1;while(++e<d)c[e].className.indexOf("iepp_")<0&&(c[e].className+=" iepp_"+f[a])}l.appendChild(r),m.appendChild(o),o.className=r.className,o.id=r.id,o.innerHTML=r.innerHTML.replace(i,"<$1font")},d._beforePrint=function(){p.styleSheet.cssText=d.parseCSS(d.getCSS(b.styleSheets,"all")),d.writeHTML()},d.restoreHTML=function(){o.innerHTML="",m.removeChild(o),m.appendChild(r)},d._afterPrint=function(){d.restoreHTML(),p.styleSheet.cssText=""},s(b),s(l);d.disablePP||(n.insertBefore(p,n.firstChild),p.media="print",p.className="iepp-printshim",a.attachEvent("onbeforeprint",d._beforePrint),a.attachEvent("onafterprint",d._afterPrint))}(a,b),e._version=d,e._prefixes=o,e._domPrefixes=p,e.mq=w,e.hasEvent=x,e.testProp=function(a){return F([a])},e.testAllProps=G,e.testStyles=v,e.prefixed=function(a){return G(a,"pfx")},g.className=g.className.replace(/\bno-js\b/,"")+(f?" js "+u.join(" "):"");return e}(this,this.document),function(a,b){function u(){r(!0)}a.respond={},respond.update=function(){},respond.mediaQueriesSupported=b;if(!b){var c=a.document,d=c.documentElement,e=[],f=[],g=[],h={},i=30,j=c.getElementsByTagName("head")[0]||d,k=j.getElementsByTagName("link"),l=[],m=function(){var b=k,c=b.length,d=0,e,f,g,i;for(;d<c;d++)e=b[d],f=e.href,g=e.media,i=e.rel&&e.rel.toLowerCase()==="stylesheet",!!f&&i&&!h[f]&&(!/^([a-zA-Z]+?:(\/\/)?(www\.)?)/.test(f)||f.replace(RegExp.$1,"").split("/")[0]===a.location.host?l.push({href:f,media:g}):h[f]=!0);n()},n=function(){if(l.length){var a=l.shift();s(a.href,function(b){o(b,a.href,a.media),h[a.href]=!0,n()})}},o=function(a,b,c){var d=a.match(/@media[^\{]+\{([^\{\}]+\{[^\}\{]+\})+/gi),g=d&&d.length||0,b=b.substring(0,b.lastIndexOf("/")),h=function(a){return a.replace(/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,"$1"+b+"$2$3")},i=!g&&c,j=0,k,l,m,n,o;b.length&&(b+="/"),i&&(g=1);for(;j<g;j++){k=0,i?(l=c,f.push(h(a))):(l=d[j].match(/@media ([^\{]+)\{([\S\s]+?)$/)&&RegExp.$1,f.push(RegExp.$2&&h(RegExp.$2))),n=l.split(","),o=n.length;for(;k<o;k++)m=n[k],e.push({media:m.match(/(only\s+)?([a-zA-Z]+)(\sand)?/)&&RegExp.$2,rules:f.length-1,minw:m.match(/\(min\-width:[\s]*([\s]*[0-9]+)px[\s]*\)/)&&parseFloat(RegExp.$1),maxw:m.match(/\(max\-width:[\s]*([\s]*[0-9]+)px[\s]*\)/)&&parseFloat(RegExp.$1)})}r()},p,q,r=function(a){var b="clientWidth",h=d[b],l=c.compatMode==="CSS1Compat"&&h||c.body[b]||h,m={},n=c.createDocumentFragment(),o=k[k.length-1],s=(new Date).getTime();if(a&&p&&s-p<i)clearTimeout(q),q=setTimeout(r,i);else{p=s;for(var t in e){var u=e[t];if(!u.minw&&!u.maxw||(!u.minw||u.minw&&l>=u.minw)&&(!u.maxw||u.maxw&&l<=u.maxw))m[u.media]||(m[u.media]=[]),m[u.media].push(f[u.rules])}for(var t in g)g[t]&&g[t].parentNode===j&&j.removeChild(g[t]);for(var t in m){var v=c.createElement("style"),w=m[t].join("\n");v.type="text/css",v.media=t,v.styleSheet?v.styleSheet.cssText=w:v.appendChild(c.createTextNode(w)),n.appendChild(v),g.push(v)}j.insertBefore(n,o.nextSibling)}},s=function(a,b){var c=t();if(!!c){c.open("GET",a,!0),c.onreadystatechange=function(){c.readyState==4&&(c.status==200||c.status==304)&&b(c.responseText)};if(c.readyState==4)return;c.send()}},t=function(){var a=!1,b=[function(){return new ActiveXObject("Microsoft.XMLHTTP")},function(){return new XMLHttpRequest}],c=b.length;while(c--){try{a=b[c]()}catch(d){continue}break}return function(){return a}}();m(),respond.update=m,a.addEventListener?a.addEventListener("resize",u,!1):a.attachEvent&&a.attachEvent("onresize",u)}}(this,Modernizr.mq("only all")),function(a,b,c){function k(a){return!a||a=="loaded"||a=="complete"}function j(){var a=1,b=-1;while(p.length- ++b)if(p[b].s&&!(a=p[b].r))break;a&&g()}function i(a){var c=b.createElement("script"),d;c.src=a.s,c.onreadystatechange=c.onload=function(){!d&&k(c.readyState)&&(d=1,j(),c.onload=c.onreadystatechange=null)},m(function(){d||(d=1,j())},H.errorTimeout),a.e?c.onload():n.parentNode.insertBefore(c,n)}function h(a){var c=b.createElement("link"),d;c.href=a.s,c.rel="stylesheet",c.type="text/css";if(!a.e&&(w||r)){var e=function(a){m(function(){if(!d)try{a.sheet.cssRules.length?(d=1,j()):e(a)}catch(b){b.code==1e3||b.message=="security"||b.message=="denied"?(d=1,m(function(){j()},0)):e(a)}},0)};e(c)}else c.onload=function(){d||(d=1,m(function(){j()},0))},a.e&&c.onload();m(function(){d||(d=1,j())},H.errorTimeout),!a.e&&n.parentNode.insertBefore(c,n)}function g(){var a=p.shift();q=1,a?a.t?m(function(){a.t=="c"?h(a):i(a)},0):(a(),j()):q=0}function f(a,c,d,e,f,h){function i(){!o&&k(l.readyState)&&(r.r=o=1,!q&&j(),l.onload=l.onreadystatechange=null,m(function(){u.removeChild(l)},0))}var l=b.createElement(a),o=0,r={t:d,s:c,e:h};l.src=l.data=c,!s&&(l.style.display="none"),l.width=l.height="0",a!="object"&&(l.type=d),l.onload=l.onreadystatechange=i,a=="img"?l.onerror=i:a=="script"&&(l.onerror=function(){r.e=r.r=1,g()}),p.splice(e,0,r),u.insertBefore(l,s?null:n),m(function(){o||(u.removeChild(l),r.r=r.e=o=1,j())},H.errorTimeout)}function e(a,b,c){var d=b=="c"?z:y;q=0,b=b||"j",C(a)?f(d,a,b,this.i++,l,c):(p.splice(this.i++,0,a),p.length==1&&g());return this}function d(){var a=H;a.loader={load:e,i:0};return a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=r&&!s,u=s?l:n.parentNode,v=a.opera&&o.call(a.opera)=="[object Opera]",w="webkitAppearance"in l.style,x=w&&"async"in b.createElement("script"),y=r?"object":v||x?"img":"script",z=w?"img":y,A=Array.isArray||function(a){return o.call(a)=="[object Array]"},B=function(a){return Object(a)===a},C=function(a){return typeof a=="string"},D=function(a){return o.call(a)=="[object Function]"},E=[],F={},G,H;H=function(a){function f(a){var b=a.split("!"),c=E.length,d=b.pop(),e=b.length,f={url:d,origUrl:d,prefixes:b},g,h;for(h=0;h<e;h++)g=F[b[h]],g&&(f=g(f));for(h=0;h<c;h++)f=E[h](f);return f}function e(a,b,e,g,h){var i=f(a),j=i.autoCallback;if(!i.bypass){b&&(b=D(b)?b:b[a]||b[g]||b[a.split("/").pop().split("?")[0]]);if(i.instead)return i.instead(a,b,e,g,h);e.load(i.url,i.forceCSS||!i.forceJS&&/css$/.test(i.url)?"c":c,i.noexec),(D(b)||D(j))&&e.load(function(){d(),b&&b(i.origUrl,h,g),j&&j(i.origUrl,h,g)})}}function b(a,b){function c(a){if(C(a))e(a,h,b,0,d);else if(B(a))for(i in a)a.hasOwnProperty(i)&&e(a[i],h,b,i,d)}var d=!!a.test,f=d?a.yep:a.nope,g=a.load||a.both,h=a.callback,i;c(f),c(g),a.complete&&b.load(a.complete)}var g,h,i=this.yepnope.loader;if(C(a))e(a,0,i,0);else if(A(a))for(g=0;g<a.length;g++)h=a[g],C(h)?e(h,0,i,0):A(h)?H(h):B(h)&&b(h,i);else B(a)&&b(a,i)},H.addPrefix=function(a,b){F[a]=b},H.addFilter=function(a){E.push(a)},H.errorTimeout=1e4,b.readyState==null&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",G=function(){b.removeEventListener("DOMContentLoaded",G,0),b.readyState="complete"},0)),a.yepnope=d()}(this,this.document),Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0))};
\ No newline at end of file
--- a/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/projects.css.scss
@@ -102,54 +102,6 @@ table.round-borders {
  float:left;
 }
-.day-commits-table {
-  @include round-borders-all(4px);
-  padding: 4px 0px;
-  margin-bottom:10px;
-  display:block;
-  width:100%;
-  background: #E6F1F6;
-  .day-header {
-    padding:10px;
-    h3 {
-      margin:0px;
-    }
-  }
-  ul {
-    display:block;
-    list-style:none;
-    margin:0px;
-    padding:0px;
-    li.commit {
-      display:list-item;
-      padding:8px;
-      margin:0px;
-      background: #F7FBFC;
-      border-top: 1px solid #E2EAEE;
-      &:first-child {
-        border-top: 1px solid #E2EAEE;
-      }
-      &:nth-child(2n+1) {
-        background: white;
-      }
-      a.button {
-        width:85px;
-        padding:10px;
-        margin:0px;
-        float:right;
-      }
-      p {
-        margin-bottom: 3px;
-        font-size: 13px;
-      }
-    }
-  }
-}
 @mixin panel-color {
  background: #111 !important;
  background: -webkit-gradient(linear,left top,left bottom,from(#333),to(#111)) !important;
@@ -210,9 +162,9 @@ table.round-borders {
  padding:20px;
 }
-body {
+//body {
-  background: #eaeaea;
+  //background: #eaeaea;
-}
+//}
 a {
  color: #111;
@@ -383,23 +335,19 @@ input.ssh_project_url {
  border-width: 1px;
 }
-tbody tr:nth-child(2n) td, tbody tr.even td {
-  background: none repeat scroll 0 0 #F7FBFC;
-  border-top: 1px solid #E2EAEE;
-  border-bottom: 1px solid #E2EAEE;
-}
 .top_menu_count {
-  background: none repeat scroll 0 0 #FFF6BF;
+  background: none repeat scroll 0 0 white;
-  border-color: #FFD324;
+  color: #333;
-  color: #514721;
+  border-color: #4BB8D2;
-  border: 1px solid #DDDDDD;
  padding: 2px;
-  font-size:12px;
+  font-size:10px;
-  position:relative;
-  top:-14px;
-  left:10px;
  border-top:none;
+  text-align:center;
+  float:right;
+  width:25px;
 }
 #logo {
@@ -411,7 +359,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
  text-shadow: #555 1px 1px;
 }
-/** FALSH **/
+/** FLASH **/
 #flash_container {
  height:40px;
@@ -429,6 +377,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
    color:#444;
    font-size:22px;
    padding-top:5px;
+    margin:2px;
  }
 }
@@ -682,9 +631,9 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
 }
 .top_panel_issues{
-  #issue_search_form { 
+  #issue_search_form {
-    margin:5px 0; 
+    margin:5px 0;
-    input { 
+    input {
      border:1px solid #D3D3D3;
      padding: 3px;
      height: 28px;
@@ -693,10 +642,67 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
      box-sizing: border-box;
      -moz-box-sizing: border-box;
-      &:focus { 
+      &:focus {
        border-color:#c2e1ef;
      }
    }
  }
 }
+.left { 
+  float:left;
+}
+.right { 
+  float:right;
+}
+.width-50p{
+  width:50%;
+}
+.width-49p{
+  width:49%;
+}
+.width-30p{
+  width:30%;
+}
+.width-65p{
+  width:65%;
+}
+pre.commit_message {
+  white-space: pre-wrap;
+}
+#container { 
+  min-height:100%;
+}
+.ui-selectmenu{
+  @include round-borders-all(4px);
+  margin-right:10px;
+  font-size:1.5em;
+  height:auto;
+  font-weight:bold;
+  .ui-selectmenu-status { 
+    padding:3px 10px;
+  }
+}
+td.code { 
+  width: 100%;
+  .highlight { 
+    margin-left: 55px;
+    overflow:auto;
+    overflow-y:hidden;
+  }
+}
+.highlight pre { 
+  white-space: pre;
+  word-wrap:normal;
+}
+.highlighttable tr:hover {
+  background:white;
+}
+table.highlighttable pre{ 
+  line-height:16px !important;
+  font-size:12px !important;
+}
--- a/app/assets/stylesheets/style.scss
+++ b/app/assets/stylesheets/style.scss
+/* HTML5 ✰ Boilerplate
+ * ==|== normalize ==========================================================
+ */
+article, aside, details, figcaption, figure, footer, header, hgroup, nav, section { display: block; }
+audio, canvas, video { display: inline-block; *display: inline; *zoom: 1; }
+audio:not([controls]) { display: none; }
+[hidden] { display: none; }
+html { font-size: 100%; overflow-y: scroll; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; }
+body { margin: 0; font-size: 13px; line-height: 1.231; }
+body, button, input, select, textarea { font-family: sans-serif; color: #222; }
+::-moz-selection { background: #fe57a1; color: #fff; text-shadow: none; }
+::selection { background: #fe57a1; color: #fff; text-shadow: none; }
+a { color: #00e; }
+a:hover { color: #06e; }
+a:focus { outline: thin dotted; }
+a:hover, a:active { outline: 0; }
+abbr[title] { border-bottom: 1px dotted; }
+b, strong { font-weight: bold; }
+blockquote { margin: 1em 40px; }
+dfn { font-style: italic; }
+hr { display: block; height: 1px; border: 0; border-top: 1px solid #ccc; margin: 1em 0; padding: 0; }
+ins { background: #ff9; color: #000; text-decoration: none; }
+mark { background: #ff0; color: #000; font-style: italic; font-weight: bold; }
+pre, code, kbd, samp { font-family: monospace, monospace; _font-family: 'courier new', monospace; font-size: 1em; }
+pre { white-space: pre; white-space: pre-wrap; word-wrap: break-word; }
+q { quotes: none; }
+q:before, q:after { content: ""; content: none; }
+small { font-size: 85%; }
+sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
+sup { top: -0.5em; }
+sub { bottom: -0.25em; }
+ul, ol { margin: 1em 0; padding: 0 0 0 40px; }
+dd { margin: 0 0 0 40px; }
+nav ul, nav ol { list-style: none; list-style-image: none; margin: 0; padding: 0; }
+img { border: 0; -ms-interpolation-mode: bicubic; vertical-align: middle; }
+svg:not(:root) { overflow: hidden; }
+figure { margin: 0; }
+form { margin: 0; }
+fieldset { border: 0; margin: 0; padding: 0; }
+label { cursor: pointer; }
+legend { border: 0; *margin-left: -7px; padding: 0; }
+button, input, select, textarea { font-size: 100%; margin: 0; vertical-align: baseline; *vertical-align: middle; }
+button, input { line-height: normal; *overflow: visible; }
+table button, table input { *overflow: auto; }
+button, input[type="button"], input[type="reset"], input[type="submit"] { cursor: pointer; -webkit-appearance: button; }
+input[type="checkbox"], input[type="radio"] { box-sizing: border-box; }
+input[type="search"] { -webkit-appearance: textfield; -moz-box-sizing: content-box; -webkit-box-sizing: content-box; box-sizing: content-box; }
+input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }
+button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
+textarea { overflow: auto; vertical-align: top; resize: vertical; }
+input:valid, textarea:valid {  }
+input:invalid, textarea:invalid { background-color: #f0dddd; }
+table { border-collapse: collapse; border-spacing: 0; }
+td { vertical-align: top; }
+/* ==|== primary styles =====================================================
+   Author: Ricardo Rauch
+   ========================================================================== */
+/* 960gs */
+.container_4{width:98%;margin-left:1%;margin-right:1%}.grid_1,.grid_2,.grid_3,.grid_4{display:inline;float:left;position:relative;margin-left:1%;margin-right:1%}.alpha{margin-left:0}.omega{margin-right:0}.container_4 .grid_1{width:23.0%}.container_4 .grid_2{width:48.0%}.container_4 .grid_3{width:73.0%}.container_4 .grid_4{width:98.0%}.container_4 .prefix_1{padding-left:25.0%}.container_4 .prefix_2{padding-left:50.0%}.container_4 .prefix_3{padding-left:75.0%}.container_4 .suffix_1{padding-right:25.0%}.container_4 .suffix_2{padding-right:50.0%}.container_4 .suffix_3{padding-right:75.0%}.container_4 .push_1{left:25.0%}.container_4 .push_2{left:50.0%}.container_4 .push_3{left:75.0%}.container_4 .pull_1{left:-25.0%}.container_4 .pull_2{left:-50.0%}.container_4 .pull_3{left:-75.0%}.clear{clear:both;display:block;overflow:hidden;visibility:hidden;width:0;height:0}.clearfix:after{clear:both;content:' ';display:block;font-size:0;line-height:0;visibility:hidden;width:0;height:0}.clearfix{display:inline-block}* html .clearfix{height:1%}.clearfix{display:block}
+/* eo 960gs*/
+/* Vars */
+$color: "#4BB8D2";
+$blue_link: "#2fa0bb";
+/* eo Vars */
+html{ -webkit-font-smoothing:antialiased; }
+*{text-shadow: 0 1px 0 white}
+body{font-size: 12px; background-color: #eee;}
+a{text-decoration: none; font-weight: bold; color: #666}
+a:hover{color: #333}
+/* Typography */
+h1,h2,h3,h4,h5{font-weight: normal; color: #666}
+h2{margin: 1.5em 0}
+/* eo Typography */
+/* Forms */
+input[type="text"]:focus, input[type="password"]:focus {  outline: none; }
+input.text{border: 1px solid #ccc; border-radius: 4px; display: block; padding: 10px}
+/* eo Forms */
+/* Tables */
+table {width:100%; border: 1px solid #DEE2E3}
+table thead{
+	-webkit-border-top-left-radius: 5px;
+	-webkit-border-top-right-radius: 5px;
+	-moz-border-radius-topleft: 5px;
+	-moz-border-radius-topright: 5px;
+	border-top-left-radius: 5px;
+	border-top-right-radius: 5px;
+}
+table  thead th{
+	background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #fefefe), to(#F6F7F8));
+	background-image: -webkit-linear-gradient(#fefefe 7.6%, #F6F7F8);
+	background-image: -moz-linear-gradient(#fefefe 7.6%, #F6F7F8);
+	background-image: -o-linear-gradient(#fefefe 7.6%, #F6F7F8);
+	margin: 0;
+	font-weight: normal;
+	font-weight: bold;
+	text-align: left;
+	color: #97A0A5;
+}
+td, th{ padding: .9em 1em; vertical-align: middle; }
+table  thead .image{width:100px}
+table  tr:hover, .listed_items tr.odd:hover{background-color:#FFFFCF}
+/* eo Tables */
+/* Buttons */
+.grey-button{
+	border-radius: 5px;
+	font-size: 12px;
+	font-weight: bold;
+	padding: 6px 20px;
+	border: 1px solid #999;
+	color: #666;
+	display: inline-block;
+	box-shadow: 0 1px 2px rgba(0,0,0,.3);
+	background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #f7f7f7), to(#d5d5d5));
+	background-image: -webkit-linear-gradient(#f7f7f7 7.6%, #d5d5d5);
+	background-image: -moz-linear-gradient(#f7f7f7 7.6%, #d5d5d5);
+	background-image: -o-linear-gradient(#f7f7f7 7.6%, #d5d5d5);
+}
+.button{
+	padding: 10px 20px;
+	text-align: center;
+	display: inline-block;
+	border-radius: 5px;
+	color: #578E91;
+	font-size: 12px;
+	text-transform: uppercase;
+	border: 1px solid #8CE2E6;
+	background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #dbf5f6), to(#c5eef0));
+	background-image: -webkit-linear-gradient(#dbf5f6 79.4%, #c5eef0);
+	background-image: -moz-linear-gradient(#dbf5f6 79.4%, #c5eef0);
+	background-image: -o-linear-gradient(#dbf5f6 79.4%, #c5eef0);
+}
+.button:hover {color: rgba(0,0,0,.8)}
+.button.green {margin-right: 0; }
+.button.yellow{
+	color: #908054;
+	border-color: #DDCDA1;
+	background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #FFEFC3), to(#F3E3B7));
+	background-image: -webkit-linear-gradient(#FFEFC3 79.4%, #F3E3B7);
+	background-image: -moz-linear-gradient(#FFEFC3 79.4%, #F3E3B7);
+	background-image: -o-linear-gradient(#FFEFC3 79.4%, #F3E3B7);	
+}
+.button.blue{
+	color: #417E97;
+	border-color: #b2cdec;
+	background-image: -webkit-gradient(linear, 0 0, 0 34, color-stop(0.794, #dbe8f6), to(#c7daf1));
+	background-image: -webkit-linear-gradient(#dbe8f6 79.4%, #c7daf1);
+	background-image: -moz-linear-gradient(#dbe8f6 79.4%, #c7daf1);
+	background-image: -o-linear-gradient(#dbe8f6 79.4%, #c7daf1);
+}
+.button-small{ text-shadow: none;  padding: 4px 10px; }
+.button-green{background: #A6B807; color: white}
+/* eo Buttons */
+/* UI Box */
+.ui-box{border: 1px solid #DEDFE1; float: left; border-radius: 5px}
+.ui-box h3{
+	background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #fefefe), to(#F6F7F8));
+	background-image: -webkit-linear-gradient(#fefefe 7.6%, #F6F7F8);
+	background-image: -moz-linear-gradient(#fefefe 7.6%, #F6F7F8);
+	background-image: -o-linear-gradient(#fefefe 7.6%, #F6F7F8);
+	margin: 0;
+	padding: 1em;
+	font-size: 12px;
+	font-weight: normal;
+	font-weight: bold;
+	font-size: 16px;
+	border-bottom: 1px solid #DEDFE1;
+	-webkit-border-top-left-radius: 5px;
+	-webkit-border-top-right-radius: 5px;
+	-moz-border-radius-topleft: 5px;
+	-moz-border-radius-topright: 5px;
+	border-top-left-radius: 5px;
+	border-top-right-radius: 5px;
+}
+.ui-box.ui-box-small h3{
+	padding: 8px 10px;
+	font-size: 12px;
+}
+.ui-box .data{padding: .5em 1em}
+.ui-box .buttons{background-color: #f7f8f9; padding: 1em;
+	-webkit-border-bottom-right-radius: 5px;
+	-webkit-border-bottom-left-radius: 5px;
+	-moz-border-radius-bottomright: 5px;
+	-moz-border-radius-bottomleft: 5px;
+	border-bottom-right-radius: 5px;
+	border-bottom-left-radius: 5px;	
+}
+.ui-box .buttons .button{padding: 8px 9px; font-size: 11px}
+.ui-box.hover:hover{box-shadow: 0 0 10px rgba(0,0,0,.1); border: 1px solid #ccc;
+	-webkit-transition: all 200ms cubic-bezier(0.470, 0.000, 0.745, 0.715);
+	-moz-transition: all 200ms cubic-bezier(0.470, 0.000, 0.745, 0.715);
+	-o-transition: all 200ms cubic-bezier(0.470, 0.000, 0.745, 0.715);
+	transition: all 200ms cubic-bezier(0.470, 0.000, 0.745, 0.715);	
+}
+/* eo UI Box */
+/* Login Page */
+body.login-page{background-color: #f1f1f1; padding-top: 10%}
+.login-box{
+	width: 304px;
+	position: relative;
+	border-radius: 5px;
+	margin: auto;
+	padding: 20px;
+	background: white;
+	box-shadow: rgba(0, 0, 0, 0.07) 0 1px 0,white 0 2px 0,rgba(0, 0, 0, 0.07) 0 3px 0,white 0 4px 0, rgba(0, 0, 0, 0.07) 0 5px 0;
+}
+.login-box .login-logo{
+	margin: 10px 0 30px 0;
+	display: block;
+}
+.login-box input.text{background-color: #f1f1f1; font-size: 16px; border-radius: 0; padding: 14px 10px; width: 280px}
+.login-box input.text.top{
+	-webkit-border-top-left-radius: 5px;
+	-webkit-border-top-right-radius: 5px;
+	-moz-border-radius-topleft: 5px;
+	-moz-border-radius-topright: 5px;
+	border-top-left-radius: 5px;
+	border-top-right-radius: 5px;
+}
+.login-box input.text.bottom{
+	-webkit-border-bottom-right-radius: 5px;
+	-webkit-border-bottom-left-radius: 5px;
+	-moz-border-radius-bottomright: 5px;
+	-moz-border-radius-bottomleft: 5px;
+	border-bottom-right-radius: 5px;
+	border-bottom-left-radius: 5px;
+	border-top: 0;
+	margin-bottom: 20px;
+}
+.login-box a.forgot{float: right; padding-top: 6px}
+/* Icons */
+.directory, .file{
+	display: inline-block;
+	margin-right: 10px;
+	width: 14px;
+}
+.directory{
+	background: url('images.png') no-repeat -73px -26px;
+	height: 11px;
+	margin-bottom: -1px;
+}
+.file{
+	background: url('images.png') no-repeat -114px -24px;
+	height: 16px;
+	margin-bottom: -3px;
+}
+/* eo Icons*/
+/* General */
+#container{background-color: white; overflow: hidden;}
+/*#container{margin: auto; width: 980px; border: 1px solid rgba(0,0,0,.22); border-top: 0; box-shadow: 0 0 0px 4px rgba(0,0,0,.04)}*/
+/* Header */
+header{background: #474D57 url('bg-header.png') repeat-x bottom; z-index: 10000; height: 44px; padding: 10px 2% 6px 2%}
+header a{color: white; text-shadow: 0 -1px 0 black}
+header a:hover{color: #f1f1f1}
+header h1{
+	width: 65px;
+}
+header h1.logo{margin: 0; padding: 0}
+header h1.logo a{
+	background: url('images.png') no-repeat -3px -7px;
+		width: 65px;
+		height: 26px;
+	margin: 5px 0;
+	padding: 0;
+	display: block;
+	float: left;
+	text-indent: -1000em;
+}
+header nav{border-radius: 4px; box-shadow: 0 1px 2px black; width: 294px; margin: auto;
+	background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #595d63), to(#31363e));
+	background-image: -webkit-linear-gradient(#595d63 6.6%, #31363e);
+	background-image: -moz-linear-gradient(#595d63 6.6%, #31363e);
+	background-image: -o-linear-gradient(#595d63 6.6%, #31363e);
+	margin-top: 2px;
+}
+header nav a{padding: 8px 12px 8px 34px; display: inline-block; color: #D6DADF; border-right: 1px solid #31363E; position: relative; box-shadow: 1px 0 0 rgba(255,255,255,.1); margin: 0}
+header nav a span{width: 20px; height: 20px; display: inline-block; background: red; position: absolute; left: 8px; top: 6px;}
+header nav a:last-child {border: 0; box-shadow: none}
+header nav a:hover, header nav a.current{
+		background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #595d63), to(#2c2f35));
+		background-image: -webkit-linear-gradient(#595d63 6.6%, #2c2f35);
+		background-image: -moz-linear-gradient(#595d63 6.6%, #202227);
+		background-image: -o-linear-gradient(#595d63 6.6%, #202227);
+}
+header nav a:active{
+	box-shadow: 0 1px 4px rgba(0,0,0,.8) inset;
+}
+header nav a.dashboard {
+	-webkit-border-top-left-radius: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	border-top-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+}
+header nav a.admin{
+	-webkit-border-top-right-radius: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+	-moz-border-radius-topright: 4px;
+	-moz-border-radius-bottomright: 4px;
+	border-top-right-radius: 4px;
+	border-bottom-right-radius: 4px;
+}
+header .search{ display: inline-block; float: right;  margin-right: 10px}
+header nav a span{width: 20px; height: 20px; display: inline-block; background: red; position: absolute; left: 8px; top: 6px;}
+header nav a.dashboard span{background: url('images.png') no-repeat -161px 0;}
+header nav a.admin span{background: url('images.png') no-repeat 	-184px 0;}
+header nav a.project span{background: url('images.png') 		no-repeat -209px -1px; top: 7px}
+/*
+header nav a span{width: 20px; height: 20px; display: inline-block; background: red; position: absolute; left: 8px; top: 14px;}
+header nav a.dashboard.current span{ background-position: -163px -22px; }			
+header nav a.admin.current span{ background-position: -186px -22px;}			
+header nav a.project.current span{ background-position: -211px -23px;}		
+header nav a.project span{background: url('images.png') 		no-repeat -209px -1px; top: 15px}
+header nav a span.current{top: 18px}
+header nav {margin-left: 180px; display: inline-block; float: left;}
+header nav a{float: left; background: #31363e; padding: 16px 20px 20px 34px; margin-right: 10px;
+	-webkit-border-top-left-radius: 5px;
+	-webkit-border-top-right-radius: 5px;
+	-moz-border-radius-topleft: 5px;
+	-moz-border-radius-topright: 5px;
+	border-top-left-radius: 5px;
+	border-top-right-radius: 5px;	
+	position: relative; 
+}
+header nav a.current{background: white; color: #333; text-shadow: none;}
+*/
+header .login-top{float: right; width: 180px;
+	background-image: -webkit-gradient(linear, 0 0, 0 62, color-stop(0.032, #464c56), to(#363c45));
+	background-image: -webkit-linear-gradient(#464c56 3.2%, #363c45);
+	background-image: -moz-linear-gradient(#464c56 3.2%, #363c45);
+	background-image: -o-linear-gradient(#464c56 3.2%, #363c45);
+	padding: 0 10px;
+	height: 44px;	
+}
+header .login-top a{display: block;}
+header .login-top a.pic{float: left; margin-right: 10px;
+	img{ height: 36px; width: 36px; border: 1px solid black}
+}
+header .login-top a.username{margin-bottom: 5px}
+header .login-top a.logout{color: #ccc}
+header{margin-bottom: 0; clear: both; }
+.page-title{background-color: #f1f1f1;display: block; float: left; clear: both; width: 98%; padding: 1% 1%; border-bottom: 1px solid #ccc; box-shadow: 0 -1px 0 white inset; margin-bottom: 1.5em}
+.page-title h1{font-size: 20px; width: 400px; margin: 0; padding-top: 8px }
+.page-title a.grey-button{float: right;}
+.right{float: right;}
+/* Account box */
+header .account-box{position: relative;z-index: 10000; top: -3px; width: 38px; height: 38px; font-size: 11px; float: right; display: block;  cursor: pointer; }
+header .account-box img{ border-radius: 4px; width: 38px; height: 38px; display: block; box-shadow: 0 1px 2px black}
+header .account-box:after{
+	content: " "; 
+  display: block;
+  position: absolute;
+  top: 0;
+  right: 0;
+left: 0;
+  bottom: 0;
+float: right;
+	border-radius: 5px;
+  border: 1px solid rgba(255, 255, 255, .1);
+  border-bottom: 0;
+  background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(255, 255, 255, .15)), to(rgba(0, 0, 0, .25))), -webkit-gradient(linear, left top, right bottom, color-stop(0, rgba(255, 255, 255, 0)), color-stop(0.5, rgba(255, 255, 255, .1)), color-stop(0.501, rgba(255, 255, 255, 0)), color-stop(1, rgba(255, 255, 255, 0)));
+  background: -moz-linear-gradient(top, rgba(255, 255, 255, .15), rgba(0, 0, 0, .25)), -moz-linear-gradient(left top, rgba(255, 255, 255, 0), rgba(255, 255, 255, .1) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0));
+  background: linear-gradient(top, rgba(255, 255, 255, .15), rgba(0, 0, 0, .25)), linear-gradient(left top, rgba(255, 255, 255, 0), rgba(255, 255, 255, .1) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0));
+  -webkit-background-origin: border-box;
+  -moz-background-origin: border;
+  background-origin: border-box;
+}
+.account-box:hover > .account-links, .account-box:hover > .arrow-up{display: block;}
+header .account-links{background: white; display: none; border-radius: 5px; width: 100px; margin-top: 0; float: right; box-shadow: 0 1px 1px rgba(0,0,0,.2); }
+header .account-links a{color: #666; padding: 6px 10px; display: block; text-shadow: none;  border-bottom: 1px solid #eee}
+header .account-links a:hover{background-color: #f1f1f1; text-shadow: none; color: #333}
+header .account-links a:first-child{
+	-webkit-border-top-left-radius: 5px;
+	-webkit-border-top-right-radius: 5px;
+	-moz-border-radius-topleft: 5px;
+	-moz-border-radius-topright: 5px;
+	border-top-left-radius: 5px;
+	border-top-right-radius: 5px;
+}
+header .account-links a:last-child{
+	-webkit-border-bottom-right-radius: 5px;
+	-webkit-border-bottom-left-radius: 5px;
+	-moz-border-radius-bottomright: 5px;
+	-moz-border-radius-bottomleft: 5px;
+	border-bottom-right-radius: 5px;
+	border-bottom-left-radius: 5px;
+	border-bottom: 0;
+}
+header a.arrow-up{
+	display: none;
+	width: 0;
+  height: 0;
+	float: right;
+	margin-right: 26px;
+	margin-bottom: 0;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-bottom: 5px solid white;
+}
+/* eo Account Box */
+input.search-input{float: left; text-shadow: none; width: 116px; background-image: url('icon-search.png') ; background-repeat: no-repeat; background-position: 10px; border-radius: 100px; border: 1px solid rgba(0,0,0,.7); box-shadow: 0 1px 0 rgba(255,255,255,.2), 0 2px 2px rgba(0,0,0,.4) inset ; background-color: #D2D5DA; background-color: rgba(255,255,255,.5); padding: 5px; padding-left: 26px;  margin-top: 4px; margin-right: 10px }
+input.search-input:focus{ background-color: white; width: 216px;}
+input.search-input::-webkit-input-placeholder {color: #666}
+/* eo Header */
+h2.icon{position: relative; padding-left: 40px; float: left; }
+/*h2 a{font-weight: normal;}*/
+h2.icon span{background: #E3E5EA url('images.png');  height: 32px; width: 32px; left: 0; top: -5px; border-radius: 4px; display: inline-block; position: absolute}
+/* Dashboard Page */
+html, body { height: 100%; }
+body.dashboard-page h2.icon span{ background-position:  9px -69px; }
+body.dashboard-page header{margin-bottom: 0}
+body.dashboard-page .news-feed{padding-left: 1em; margin-right: 450px; margin-left: 1%}
+body.dashboard-page .dashboard-content{ position: relative; float: left; width: 100%; height: 100%; }
+body.dashboard-page .news-feed h2{float: left;}
+body.dashboard-page aside{  width: 420px;  float: right; right: 0; height: 100%; bottom: 0;  position: absolute; background-color: #f7f7f7; border-left: 1px solid #ccc }
+body.dashboard-page aside h4{margin: 0; border-bottom: 1px solid #ccc; padding: 10px 10px; font-size: 11px; font-weight: bold; text-transform: uppercase;}
+body.dashboard-page aside h4 a.button-small{float: right; text-transform: none; border-radius: 4px; margin-right: 4%; margin-top: -4px; display: block;}
+body.dashboard-page aside .project-list {list-style: none; margin: 0; padding: 0;}
+body.dashboard-page aside .project-list li a {background: white;  color: #{$blue_link}; display: block; border-bottom: 1px solid #eee; padding: 14px 6% 14px 14px;}
+body.dashboard-page aside .project-list li a:hover {background: #f1f1f1}
+body.dashboard-page aside .project-list li a:hover span.arrow{background-color: #E3E5EA;}
+body.dashboard-page aside .project-list li a span.project-name{font-size: 14px; display: block; margin-bottom: 8px}
+body.dashboard-page aside .project-list li a span.time{color: #666; font-weight: normal; font-size: 11px}
+body.dashboard-page aside .project-list li a span.arrow{float: right; background: #E3E5EA; padding: 10px; border-radius: 5px; margin-top: 2px; text-shadow: none; color: #999}
+body.dashboard-page .news-feed .project-updates  {margin-bottom: 20px; display: block; width: 100%;}
+body.dashboard-page .news-feed .project-updates .data{ padding: 0}
+body.dashboard-page .news-feed .project-updates a.project-update {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
+body.dashboard-page .news-feed .project-updates a.project-update:last-child{border-bottom: 0}
+body.dashboard-page .news-feed .project-updates a.project-update img{float: left; margin-right: 10px;}
+body.dashboard-page .news-feed .project-updates a.project-update span.update-title, .dashboard-page .news-feed .project-updates li a span.update-author{display: block;}
+body.dashboard-page .news-feed .project-updates a.project-update span.update-title{margin-bottom: 10px}
+body.dashboard-page .news-feed .project-updates a.project-update span.update-author{color: #999; font-weight: normal; font-style: italic;}
+body.dashboard-page .news-feed .project-updates a.project-update span.update-author strong{font-weight: bold; font-style: normal;}
+/* eo Dashboard Page */
+.grey-button.right{margin-top: 20px}
+/* Project Page */
+body.project-page h2.icon .project-name, body.project-page h2.icon d{border: 1px solid #eee; padding: 5px 30px 5px 10px; border-radius: 5px; position: relative;}
+body.project-page h2.icon .project-name i.arrow{float: right;
+	position: absolute;
+	right: 10px;
+	top: 13px;
+	display: block;
+	background: url('images.png') no-repeat -97px -29px;
+	width: 4px;
+	height: 5px;
+}
+body.project-page h2.icon span{	background-position:  -78px -68px; }
+body.project-page .project-container{ position: relative; float: left; width: 100%; height: 100%; }
+body.project-page .page-title{margin-bottom: 0}
+body.project-page .project-sidebar {width: 220px;  left: 0; top: 0; height: 100%; bottom: 0;  position: absolute; background-color: #f7f7f7; border-left: 1px solid #ccc; float: left; display: inline-block; background: #f7f7f7; padding: 20px 0 20px 2%; margin: 0; }
+body.project-page .project-sidebar input.text.git-url{ font-size: 12px; border-radius: 5px; color: #666; box-shadow: 0 1px 2px rgba(0,0,0,.2) inset; padding:  8px 14px 8px 30px;  margin-bottom: 20px;	background: white url('images.png') no-repeat 8px -40px;}
+body.project-page .project-sidebar aside{width: 219px}
+body.project-page .project-sidebar aside a{display: block; position: relative; background: white; padding: 15px 10px; border-bottom: 1px solid #eee}
+body.project-page .project-sidebar aside a:first-child{
+	-webkit-border-top-left-radius: 5px;
+	-moz-border-radius-topleft: 5px;
+	border-top-left-radius: 5px;
+}
+.project-page .project-sidebar aside a:last-child{
+	-webkit-border-bottom-left-radius: 5px;
+	-moz-border-radius-bottomleft: 5px;
+	border-bottom-left-radius: 5px;
+}
+body.project-page .project-sidebar aside a:hover{background-color: #eee;}
+body.project-page .project-sidebar aside a span.number{float: right; border-radius: 5px; text-shadow: none; background: rgba(0,0,0,.12); text-align: center; padding: 5px 8px; position: absolute; top: 10px; right: 10px}
+body.project-page .project-sidebar aside a.current{background-color: #79c3e0; color: white; text-shadow: none; border-color: transparent}
+body.project-page .project-content{ padding: 20px; display: block; margin-left: 250px }
+body.project-page .project-content h2{ margin-top: 6px}
+body.project-page .project-content .button.right{margin-left: 20px}
+body.project-page table .commit a{color: #{$blue_link}}
+body.project-page table th, body.project-page table td{	border-bottom: 1px solid #DEE2E3;}
+body.project-page .fixed{position: fixed; }
+/* Commit Page */
+body.project-page.commits-page .commit-info{float: right;}
+body.project-page.commits-page .commit-info data{
+	padding: 4px 10px;
+	font-size: 11px;
+}
+body.project-page.commits-page .commit-info data.commit-button{
+	background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.192, #fff), to(#f4f4f4));
+	background-image: -webkit-linear-gradient(#fff 19.2%, #f4f4f4);
+	background-image: -moz-linear-gradient(#fff 19.2%, #f4f4f4);
+	background-image: -o-linear-gradient(#fff 19.2%, #f4f4f4);
+	box-shadow: 0 -1px 0 white inset;
+	display: block;
+	border: 1px solid #eee;
+	border-radius: 5px;
+	margin-bottom: 2px;
+	position: relative;
+	padding-right: 20px;
+}
+body.project-page.commits-page .commit-button i{
+	background: url('images.png') no-repeat -138px -27px;
+	width: 6px;
+	height: 9px;
+	float: right;
+	position: absolute;
+	top: 6px;
+	right: 5px;
+}
+body.project-page.commits-page .commits-date {display: block; width: 100%; margin-bottom: 20px}
+body.project-page.commits-page .commits-date .data {padding: 0}
+body.project-page.commits-page a.commit{padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
+body.project-page.commits-page .commits-date a.commit {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
+body.project-page.commits-page .commits-date a.commit:last-child{border-bottom: 0}
+body.project-page.commits-page .commits-date a.commit img{float: left; margin-right: 10px;}
+body.project-page.commits-page .commits-date a.commit span.commit-title{display: block;}
+body.project-page.commits-page .commits-date a.commit span.commit-title{margin-bottom: 10px}
+body.project-page.commits-page .commits-date a.commit span.commit-author{color: #999; font-weight: normal; font-style: italic;}
+body.project-page.commits-page .commits-date a.commit span.commit-author strong{font-weight: bold; font-style: normal;}
+/* eo Commit Page */
+/* eo Project Page */
+/* Projects Page */
+body.projects-page h2.icon span{background-position: -31px -70px;}
+body.projects-page .project-box.ui-box .data .repository {margin-bottom: 20px}
+body.projects-page .project-box.ui-box .data .title span{ font-weight: bold;}
+body.projects-page .project-box{width: 100%; margin-bottom: 3em}
+body.projects-page .browse-code{margin-right: 10px}
+/* eo Projects Page */
+/* ==|== non-semantic helper classes ======================================== */
+.ir { display: block; border: 0; text-indent: -999em; overflow: hidden; background-color: transparent; background-repeat: no-repeat; text-align: left; direction: ltr; }
+.ir br { display: none; }
+.hidden { display: none !important; visibility: hidden; }
+.visuallyhidden { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
+.visuallyhidden.focusable:active, .visuallyhidden.focusable:focus { clip: auto; height: auto; margin: 0; overflow: visible; position: static; width: auto; }
+.invisible { visibility: hidden; }
+.clearfix:before, .clearfix:after { content: ""; display: table; }
+.clearfix:after { clear: both; }
+.clearfix { zoom: 1; }
+/* ==|== media queries ====================================================== */
+@media only screen and (min-width: 480px) {
+}
+@media only screen and (min-width: 768px) {
+}
+/* ==|== print styles ======================================================= */
+@media print {
+  * { background: transparent !important; color: black !important; text-shadow: none !important; filter:none !important; -ms-filter: none !important; } 
+  a, a:visited { text-decoration: underline; }
+  a[href]:after { content: " (" attr(href) ")"; }
+  abbr[title]:after { content: " (" attr(title) ")"; }
+  .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after { content: ""; } 
+  pre, blockquote { border: 1px solid #999; page-break-inside: avoid; }
+  thead { display: table-header-group; }
+  tr, img { page-break-inside: avoid; }
+  img { max-width: 100% !important; }
+  @page { margin: 0.5cm; }
+  p, h2, h3 { orphans: 3; widows: 3; }
+  h2, h3 { page-break-after: avoid; }
+}
--- a/app/controllers/admin/mailer_controller.rb
+++ b/app/controllers/admin/mailer_controller.rb
 class Admin::MailerController < ApplicationController
+  layout "admin"
  before_filter :authenticate_user!
  before_filter :authenticate_admin!

--- a/app/controllers/admin/projects_controller.rb
+++ b/app/controllers/admin/projects_controller.rb
 class Admin::ProjectsController < ApplicationController
+  layout "admin"
  before_filter :authenticate_user!
  before_filter :authenticate_admin!

--- a/app/controllers/admin/team_members_controller.rb
+++ b/app/controllers/admin/team_members_controller.rb
 class Admin::TeamMembersController < ApplicationController
+  layout "admin"
  before_filter :authenticate_user!
  before_filter :authenticate_admin!

--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
 class Admin::UsersController < ApplicationController
+  layout "admin"
  before_filter :authenticate_user!
  before_filter :authenticate_admin!

--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -8,8 +8,18 @@ class ApplicationController < ActionController::Base
    render :file => File.join(Rails.root, "public", "gitosis_error"), :layout => false
  end
+  layout :layout_by_resource
  protected
+  def layout_by_resource
+    if devise_controller?
+      "devise"
+    else
+      "application"
+    end
+  end
  def abilities
    @abilities ||= Six.new
  end

--- a/app/controllers/commits_controller.rb
+++ b/app/controllers/commits_controller.rb
@@ -2,6 +2,7 @@ require "base64"
 class CommitsController < ApplicationController
  before_filter :project
+  layout "project"
  # Authorize
  before_filter :add_project_abilities

--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
 class DashboardController < ApplicationController
  def index
    @projects = current_user.projects.all
+    @active_projects = @projects.select(&:last_activity_date).sort_by(&:last_activity_date).reverse
  end
 end
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -2,6 +2,7 @@ class IssuesController < ApplicationController
  before_filter :authenticate_user!
  before_filter :project
  before_filter :issue, :only => [:edit, :update, :destroy, :show]
+  layout "project"
  # Authorize
  before_filter :add_project_abilities
@@ -41,7 +42,7 @@ class IssuesController < ApplicationController
  def create
    @issue = @project.issues.new(params[:issue])
    @issue.author = current_user
-    if @issue.save
+    if @issue.save && @issue.assignee != current_user
      Notify.new_issue_email(@issue).deliver
    end

--- a/app/controllers/keys_controller.rb
+++ b/app/controllers/keys_controller.rb
 class KeysController < ApplicationController
+  layout "profile"
  respond_to :js
  def index

--- a/app/controllers/profile_controller.rb
+++ b/app/controllers/profile_controller.rb
 class ProfileController < ApplicationController
+  layout "profile"
  def show
    @user = current_user
  end

--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
 class ProjectsController < ApplicationController
  before_filter :project, :except => [:index, :new, :create]
+  layout :determine_layout
  # Authorize
  before_filter :add_project_abilities
@@ -152,4 +153,12 @@ class ProjectsController < ApplicationController
  def project
    @project ||= Project.find_by_code(params[:id])
  end
+  def determine_layout
+    if @project && !@project.new_record?
+      "project"
+    else
+      "application"
+    end
+  end
 end
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
 class SnippetsController < ApplicationController
  before_filter :authenticate_user!
  before_filter :project
+  layout "project"
  # Authorize
  before_filter :add_project_abilities

--- a/app/controllers/team_members_controller.rb
+++ b/app/controllers/team_members_controller.rb
 class TeamMembersController < ApplicationController
  before_filter :project
+  layout "project"
  # Authorize
  before_filter :add_project_abilities

--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -28,6 +28,12 @@ module ApplicationHelper
    else
      "Never"
    end
+  rescue 
+    "Never"
+  end
+  def markdown(text)
+    RDiscount.new(text, :autolink, :no_pseudo_protocols, :safelink, :smart, :filter_html).to_html.html_safe
  end
  def search_autocomplete_source

--- a/app/helpers/dashboard_helper.rb
+++ b/app/helpers/dashboard_helper.rb
 module DashboardHelper
+  def dashboard_feed_path(project, object)
+    case object.class.name.to_s
+    when "Issue" then project_issues_path(project, project.issues.find(object.id))
+    when "Grit::Commit" then project_commit_path(project, project.repo.commits(object.id).first)
+    when "Note"
+      then 
+      note = object
+      case note.noteable_type
+      when "Issue" then project_issue_path(project, note.noteable_id)
+      when "Snippet" then project_snippet_path(project, note.noteable_id)
+      when "Commit" then project_commit_path(project, :id => note.noteable_id)
+      else wall_project_path(project)
+      end
+    else "#" 
+    end
+  rescue 
+    "#"
+  end
+  def dashboard_feed_title(object)
+    title = case object.class.name.to_s
+            when "Note" then markdown(object.note)
+            when "Issue" then object.title
+            when "Grit::Commit" then object.safe_message
+            else ""
+            end
+    "[#{object.class.name}] #{truncate(sanitize(title, :tags => []), :length => 60)} "
+  end
 end
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -10,6 +10,11 @@ class Issue < ActiveRecord::Base
  validates_presence_of :assignee_id
  validates_presence_of :author_id
+  delegate :name,
+           :email, 
+           :to => :author, 
+           :prefix => true
  validates :title,
            :presence => true,
            :length   => { :within => 0..255 }

--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -7,6 +7,11 @@ class Note < ActiveRecord::Base
  belongs_to :author,
    :class_name => "User"
+  delegate :name,
+           :email, 
+           :to => :author, 
+           :prefix => true
  attr_protected :author, :author_id
  validates_presence_of :project

--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -119,6 +119,26 @@ class Project < ActiveRecord::Base
    repo rescue false
  end
+  def last_activity 
+    updates(1).first
+  rescue 
+    nil
+  end
+  def last_activity_date
+    last_activity.try(:created_at)
+  end
+  def updates(n = 3)
+    [ 
+      fresh_commits(n),
+      issues.last(n),
+      notes.fresh.limit(n)
+    ].compact.flatten.sort do |x, y|
+      y.created_at <=> x.created_at
+    end[0...n]
+  end
  def commit(commit_id = nil)
    if commit_id
      repo.commits(commit_id).first
@@ -131,16 +151,16 @@ class Project < ActiveRecord::Base
    @heads ||= repo.heads
  end
-  def fresh_commits
+  def fresh_commits(n = 10)
    commits = heads.map do |h|
-      repo.commits(h.name, 10)
+      repo.commits(h.name, n)
    end.flatten.uniq { |c| c.id }
    commits.sort! do |x, y|
      y.committed_date <=> x.committed_date
    end
-    commits[0..10]
+    commits[0...n]
  end
  def commits_since(date)

--- a/app/views/admin/_top_menu.html.haml
+++ b/app/views/admin/_top_menu.html.haml
-%div.top_project_menu
-  %span= link_to "Users", admin_users_path, :style => "width:50px;", :class => controller.controller_name == "users" ? "current" : nil
-  %span= link_to "Projects", admin_projects_path, :style => "width:50px;", :class => controller.controller_name == "projects" ? "current" : nil
-  %span= link_to "Teams", admin_team_members_path, :style => "width:50px;", :class => controller.controller_name == "team_members" ? "current" : nil
-  %span= link_to "Emails", admin_emails_path, :style => "width:50px;", :class => controller.controller_name == "mailer" ? "current" : nil
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
 %table
-  %tr
+  %thead
    %th Name
    %th Code
    %th Path

--- a/app/views/admin/team_members/index.html.haml
+++ b/app/views/admin/team_members/index.html.haml
 - @admin_team_members.group_by(&:project).sort.each do |project, members|
  %h3= link_to project.name, [:admin, project]
  %table
-    %tr
+    %thead
      %th Name
      %th Email
      %th Read

--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
 %table
-  %tr
+  %thead
    %th Admin
    %th Name
    %th Email

--- a/app/views/commits/_commits.html.haml
+++ b/app/views/commits/_commits.html.haml
 - @commits.group_by { |c| c.committed_date.to_date }.each do |day, commits|
-  .day-commits-table
+  %div{ :class => "commits-date ui-box ui-box-small ui-box-big" }
-    .day-header
+    .day-commits-table
      %h3= day.stamp("28 Aug, 2010")
-    %ul
+      .data
-      - commits.each do |commit|
+        - commits.each do |commit|
-        %li{ :class => "commit", :url => project_commit_path(@project, :id => commit.id) }
+          %a{ :class => "commit", :href => project_commit_path(@project, :id => commit.id) }
-          - if commit.author.email
+            %span.commit-info
-            = image_tag gravatar_icon(commit.author.email), :class => "left", :width => 40, :style => "padding-right:5px;"
+              %data.commit-button
-          - else
+                = truncate(commit.id.to_s, :length => 16)
-            = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
+                %i
-          %p
+              %data.commit-browse{ :onclick => "location.href='#{tree_project_path(@project, :commit_id => commit.id)}';return false;"}
-            %strong
+                Browse Code
-              = truncate(commit.safe_message, :length => 60)
+            - if commit.author_email
-            = link_to "Browse Code", tree_project_path(@project, :commit_id => commit.id), :class => "lite_button", :style => "float:right"
+              = image_tag gravatar_icon(commit.author_email), :class => "left", :width => 40, :style => "padding-right:5px;"
-            = link_to truncate(commit.id.to_s, :length => 16), project_commit_path(@project, :id => commit.id), :class => "lite_button", :style => "width:120px;float:right"
+            - else
-          %span
+              = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
-            %span.author
+            %span.commit-title
-              = commit.author
+              %strong
-            = time_ago_in_words(commit.committed_date)
+                = truncate(commit.safe_message, :length => 60)
-            ago
+            %span.commit-author
+              %strong= commit.author_name
+              = time_ago_in_words(commit.committed_date)
+              ago
 = more_commits_link if @commits.size > 99
--- a/app/views/commits/index.html.haml
+++ b/app/views/commits/index.html.haml
-%div
+- content_for(:body_class, "project-page commits-page")
-  %h3
-    .left
+.left
-      = form_tag project_commits_path(@project), :method => :get do
+  = form_tag project_commits_path(@project), :method => :get do
-        = select_tag "branch", options_for_select(@repo.heads.map(&:name), @branch), :onchange => "this.form.submit();", :class => "", :prompt => "Branches"
+    = select_tag "branch", options_for_select(@repo.heads.map(&:name), @branch), :onchange => "this.form.submit();", :class => "", :prompt => "Branches"
-    &nbsp;
+.left
-    .left.prepend-1
+  = form_tag project_commits_path(@project), :method => :get do
-      = form_tag project_commits_path(@project), :method => :get do
+    = select_tag "tag", options_for_select(@project.tags, @tag), :onchange => "this.form.submit();", :class => "", :prompt => "Tags"
-        = select_tag "tag", options_for_select(@project.tags, @tag), :onchange => "this.form.submit();", :class => "", :prompt => "Tags"
+.clear
-    = text_field_tag "ssh", @project.url_to_repo, :class => ["ssh_project_url", "one_click_select"]
-    .clear
+%br
+-#%a.right.button{:href => "#"} Download
+-#-if can? current_user, :admin_project, @project
+  %a.right.button.blue{:href => "#"} EDIT
+%h2.icon
+  %span
+  %a.project-name{:href => "#"}
+    %i.arrow>
+    Project
+  &nbsp;
+  %d
+    %a{:href => "#"}
+      = @ref
  - if params[:path]
-    %h3{:style => "color:#555"} /#{params[:path]}
+    &nbsp;
-  %div{:id => dom_id(@project)}
+    %d
-    = render "commits"
+      %a{:href => "#"}= params[:path].split("/").join(" / ")
+%div{:id => dom_id(@project)}
+  = render "commits"
--- a/app/views/commits/show.html.haml
+++ b/app/views/commits/show.html.haml
@@ -7,7 +7,7 @@
    %td= @commit.id
  %tr
    %td Author
-    %td= @commit.author
+    %td= @commit.author_name
  %tr
    %td Commiter
    %td= @commit.committer
@@ -16,7 +16,9 @@
    %td= @commit.committed_date
  %tr
    %td Message
-    %td= @commit.safe_message
+    %td
+      %pre.commit_message
+        = preserve @commit.safe_message
  %tr
    %td Tree
    %td= link_to 'Browse Code', tree_project_path(@project, :commit_id => @commit.id)

--- a/app/views/dashboard/index.html.haml
+++ b/app/views/dashboard/index.html.haml
-timeline
+- content_for(:body_class, "dashboard-page")
+#dashboard-content.dashboard-content.content
+  %aside
+    %h4
+      - if current_user.can_create_project?
+        %a.button-small.button-green{:href => new_project_path} New Repository
+      Your Repositories
+    %ol.project-list
+      - @projects.each do |project|
+        %li
+          %a{:href => project_path(project)}
+            %span.arrow →
+            %span.project-name= project.name
+            %span.time
+              %strong Last activity:
+              = project.last_activity_date ? time_ago_in_words(project.last_activity_date) + " ago" : "Never"
+  #news-feed.news-feed
+    %h2.icon
+      %span>
+      Dashboard
+    - @active_projects.first(3).each do |project|
+      .project-box.project-updates.ui-box.ui-box-small.ui-box-big
+        %h3= project.name
+        .data
+          - project.updates.each do |update|
+            %a.project-update{:href => dashboard_feed_path(project, update)}
+              = image_tag gravatar_icon(update.author_email), :class => "left", :width => 40
+              %span.update-title
+                = dashboard_feed_title(update)
+              %span.update-author
+                %strong= update.author_name
+                authored
+                = time_ago_in_words(update.created_at) 
+                ago
+            %br
+            / .project-update
+      / .project-updates
+  / #news-feed
+/ #dashboard-content
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
-<h2>Forgot your password?</h2>
+<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :class => "login-box", :method => :post }) do |f| %>
+  <%= image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo" %>
-<div class="span-12 colborder">
+  <%= devise_error_messages! %>
-  <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
+  <%= f.email_field :email, :placeholder => "Email",  :class => "text top" %>
-    <%= devise_error_messages! %>
+  <br/>
+  <%= f.submit "Reset password", :class => "grey-button"  %>
-    <div><%= f.label :email %><br />
+  <div class="right"> <%= render :partial => "devise/shared/links" %></div>
-      <%= f.email_field :email %></div>
+<% end %>
-    <div><%= f.submit "Send me reset password instructions", :class => "lbutton vm"  %></div>
-  <% end %>
-</div>
-<div>
-  <%= render :partial => "devise/shared/links" %>
-</div>
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
-<h2>Sign in</h2>
+<%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "login-box" }) do |f| %>
+  <%= image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo" %>
+  <%= f.text_field :email, :class => "text top", :placeholder => "Email" %>
+  <%= f.password_field :password, :class => "text bottom", :placeholder => "Password"  %>
-<div class="span-12 colborder">
+  <% if devise_mapping.rememberable? -%>
-  <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+    <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
-    <div><%= f.label :email %><br />
+  <% end -%>
-      <%= f.text_field :email %></div>
+  <br/>
+  <%= f.submit "Sign in", :class => "grey-button" %>
-    <div><%= f.label :password %><br />
+  <div class="right"> <%= render :partial => "devise/shared/links" %></div>
-      <%= f.password_field :password %></div>
+<% end %>
-    <% if devise_mapping.rememberable? -%>
-      <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
-    <% end -%>
-    <br/>
-    <div><%= f.submit "Sign in", :class => "lbutton vm" %></div>
-  <% end %>
-</div>
-<div>
-  <%= render :partial => "devise/shared/links" %>
-</div>
--- a/app/views/issues/_issues.html.haml
+++ b/app/views/issues/_issues.html.haml
 %table.round-borders#issues-table
-  %tr
+  %thead
    - if can?(current_user, :admin_issue, @project) && !params[:f] || params[:f] == "0"
      %th
    %th Assignee

--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
 %h2
  = "Issue ##{@issue.id} - #{html_escape(@issue.title)}"
-.span-15
+.left.width-65p
  -#= simple_format html_escape(@issue.content)
  .issue_notes= render "notes/notes"
-.span-8.right
+.right.width-30p
  .span-8
    - if @issue.closed
      %center.success Closed

--- a/app/views/layouts/_head_panel.html.erb
+++ b/app/views/layouts/_head_panel.html.erb
-<div id="header-panel">
+<!-- Page Header -->
+<header>
+<h1 class="logo">
+  <a href="/">GITLAB</a></h1>
+  <div class="login-top">
+        <%= link_to profile_path, :class => "pic" do %>
+          <%= image_tag gravatar_icon(current_user.email) %>
+        <% end %>
+        <%= link_to profile_path, :class => "username" do %>
+          <%= current_user.name %> 
+        <% end %>
+        <%= link_to 'Logout', destroy_user_session_path, :class => "logout", :method => :delete %>
+    </div>
+    <div class="search">
+        <%= text_field_tag "search", nil, :placeholder => "Search", :class => "search-input"  %>
+      </div>
+  <!-- .login-top -->
+  <nav>
+    <%= link_to dashboard_path, :class => current_page?(root_path) ? "current dashboard" : "dashboard" do %>
+      <span></span>Dashboard
+    <% end %>
+    <%= link_to projects_path, :class => current_page?(projects_path) ? "current project" : "project" do %>
+      <span></span>Projects
+    <% end %>
+    <%= link_to((current_user.is_admin? ? admin_root_path : "#"), :class => (admin_namespace? ? "current admin" : "admin")) do %>
+      <span></span>Admin
+    <% end  %>
+  </nav>
+</header>
+<!-- eo Page Header -->
+<div id="header-panel" style="display:none">
  <div class="container">
    <div class="span-24">
      <div class="span-10">
-        <%#= image_tag "git.png", :height => 40, :class => "left" %>
-        <%#= link_to "gitlab", root_path, :id => "logo" %>
        <span class="search-holder">
-          <%= text_field_tag "search", nil, :placeholder => "Search"  %>
        </span>
      </div>
      <div class="right">
        <%= link_to truncate(@project.name, :length => 20), project_path(@project), :class => "current button" if @project && !@project.new_record? %>
-        <%= link_to 'Projects', projects_path, :class => current_page?(projects_path) ? "current button" : "button" %>
-        <%= link_to('Admin', admin_root_path, :class => admin_namespace? ? "current button" : "button" ) if current_user.is_admin? %>
-        <%= link_to profile_path, :class => ((controller.controller_name == "keys" || controller.controller_name == "profile") ? "current button" : "button") do %>
-          <%= image_tag gravatar_icon(current_user.email) %>
-          <%= current_user.name.split(" ").first %>
-        <% end %>
-        <%= link_to 'Logout', destroy_user_session_path, :style => "border-left: 1px solid #666;", :class => "button", :method => :delete %>
      </div>
    </div>
  </div>

--- a/app/views/layouts/_page_title.html.haml
+++ b/app/views/layouts/_page_title.html.haml
+- if content_for?(:page_title)
+  = yield :page_title
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
+!!!
+%html
+  %head
+    %title
+      GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
+    = stylesheet_link_tag    "application"
+    = javascript_include_tag "application"
+    = csrf_meta_tags
+    %link{:href => "/assets/favicon.png", :rel => "icon", :type => "image/png"}/
+    = javascript_tag do
+      REQ_URI = "#{request.env["REQUEST_URI"]}";
+      REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
+  %body{ :class => content_for?(:body_class) ? yield(:body_class) : 'project-page', :id => yield(:boyd_id)}
+    #container
+      = render :partial => "layouts/flash"
+      = render :partial => "layouts/head_panel"
+      .project-container
+        .project-sidebar
+          .fixed
+            %aside
+              = link_to "Users", admin_users_path, :class => controller.controller_name == "users" ? "current" : nil
+              = link_to "Projects", admin_projects_path, :class => controller.controller_name == "projects" ? "current" : nil
+              = link_to "Teams", admin_team_members_path, :class => controller.controller_name == "team_members" ? "current" : nil
+              = link_to "Emails", admin_emails_path, :class => controller.controller_name == "mailer" ? "current" : nil
+        .project-content
+          = yield
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -3,10 +3,10 @@
  %head
    %title
      GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
-    = stylesheet_link_tag 'blueprint/screen', :media => "screen, projection"
+    -#= stylesheet_link_tag 'blueprint/screen', :media => "screen, projection"
-    = stylesheet_link_tag 'blueprint/print', :media => "print"
+    -#= stylesheet_link_tag 'blueprint/print', :media => "print"
-    = stylesheet_link_tag 'blueprint/plugins/buttons/screen', :media => "screen, projection"
+    -#= stylesheet_link_tag 'blueprint/plugins/buttons/screen', :media => "screen, projection"
-    = stylesheet_link_tag 'blueprint/plugins/link-icons/screen', :media => "screen, projection"
+    -#= stylesheet_link_tag 'blueprint/plugins/link-icons/screen', :media => "screen, projection"
    = stylesheet_link_tag    "application"
    = javascript_include_tag "application"
    = csrf_meta_tags
@@ -14,15 +14,10 @@
    = javascript_tag do
      REQ_URI = "#{request.env["REQUEST_URI"]}";
      REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
-  %body#thebody
+  %body{ :class => yield(:body_class), :id => yield(:boyd_id)}
-    = render :partial => "layouts/flash"
+    #container
-    - if user_signed_in?
+      = render :partial => "layouts/flash"
      = render :partial => "layouts/head_panel"
-      .top_bar.container
+      %div{ :id => "main", :role => "main", :class => "container_4" }
-        = render :partial => "projects/top_menu" if @project && !@project.new_record?
+        = render :partial => "layouts/page_title"
-        = render :partial => "projects/projects_top_menu" if (controller.controller_name == "projects" && ["index", "new", "create"].include?(controller.action_name)) && !admin_namespace?
-        = render :partial => "profile/top_menu" if ["keys", "profile"].include?(controller.controller_name)
-        = render :partial => "admin/top_menu" if admin_namespace?
-    #content-container.container
-      .span-24
        = yield
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
+!!!
+%html
+  %head
+    %title
+      GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
+    = stylesheet_link_tag    "application"
+    = javascript_include_tag "application"
+    = csrf_meta_tags
+    %link{:href => "/assets/favicon.png", :rel => "icon", :type => "image/png"}/
+    = javascript_tag do
+      REQ_URI = "#{request.env["REQUEST_URI"]}";
+      REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
+  %body.login-page
+    = render :partial => "layouts/flash"
+    = yield
--- a/app/views/layouts/profile.html.haml
+++ b/app/views/layouts/profile.html.haml
+!!!
+%html
+  %head
+    %title
+      GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
+    = stylesheet_link_tag    "application"
+    = javascript_include_tag "application"
+    = csrf_meta_tags
+    %link{:href => "/assets/favicon.png", :rel => "icon", :type => "image/png"}/
+    = javascript_tag do
+      REQ_URI = "#{request.env["REQUEST_URI"]}";
+      REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
+  %body{ :class => content_for?(:body_class) ? yield(:body_class) : 'project-page', :id => yield(:boyd_id)}
+    #container
+      = render :partial => "layouts/flash"
+      = render :partial => "layouts/head_panel"
+      .project-container
+        .project-sidebar
+          .fixed
+            %aside
+              = link_to "Profile", profile_path, :class => current_page?(:controller => "profile", :action => :show) ? "current" : nil
+              = link_to "Password", profile_password_path,  :class => current_page?(:controller => "profile", :action => :password) ? "current" : nil
+              = link_to keys_path,  :class => controller.controller_name == "keys" ? "current" : nil do 
+                Keys
+                - unless current_user.keys.empty?
+                  %span{ :class => "number" }= current_user.keys.count
+        .project-content
+          = yield
--- a/app/views/layouts/project.html.haml
+++ b/app/views/layouts/project.html.haml
+!!!
+%html
+  %head
+    %title
+      GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
+    = stylesheet_link_tag    "application"
+    = javascript_include_tag "application"
+    = csrf_meta_tags
+    %link{:href => "/assets/favicon.png", :rel => "icon", :type => "image/png"}/
+    = javascript_tag do
+      REQ_URI = "#{request.env["REQUEST_URI"]}";
+      REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
+  %body{ :class => content_for?(:body_class) ? yield(:body_class) : 'project-page', :id => yield(:boyd_id)}
+    #container
+      = render :partial => "layouts/flash"
+      = render :partial => "layouts/head_panel"
+      .project-container
+        .project-sidebar
+          .fixed
+            %input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo}
+              %aside
+                = link_to "History", project_path(@project), :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil
+                = link_to "Tree", tree_project_path(@project), :class => current_page?(:controller => "projects", :action => "tree", :id => @project) ? "current" : nil
+                = link_to "Commits", project_commits_path(@project), :class => current_page?(:controller => "commits", :action => "index", :project_id => @project) ? "current" : nil
+                = link_to team_project_path(@project), :class => (current_page?(:controller => "projects", :action => "team", :id => @project) || controller.controller_name == "team_members") ? "current" : nil do
+                  Team
+                  - if @project.users_projects.count > 0
+                    %span{ :class => "number" }= @project.users_projects.count
+                = link_to  project_issues_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
+                  Issues
+                  - if @project.issues.opened.count > 0
+                    %span{ :class => "number" }= @project.issues.opened.count
+                = link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
+                  Wall
+                  - if @project.common_notes.count > 0
+                    %span{ :class => "number" }= @project.common_notes.count
+                = link_to project_snippets_path(@project), :class => (controller.controller_name == "snippets") ? "current" : nil do
+                  Snippets
+                  - if @project.snippets.count > 0
+                    %span{ :class => "number" }= @project.snippets.non_expired.count
+                - if @commit
+                  = link_to truncate(commit_name(@project,@commit), :length => 15), project_commit_path(@project, :id => @commit.id), :class => current_page?(:controller => "commits", :action => "show", :project_id => @project, :id => @commit.id) ? "current" : nil
+        .project-content
+          = yield
--- a/app/views/notes/_show.html.haml
+++ b/app/views/notes/_show.html.haml
@@ -2,7 +2,7 @@
  %div.note_author
    = image_tag gravatar_icon(note.author.email), :class => "left", :width => 40, :style => "padding-right:5px;"
  %div.note_content.left
-    = simple_format(html_escape(note.note))
+    = markdown(note.note)
    - if note.attachment.url
      Attachment:
      = link_to note.attachment_identifier, note.attachment.url, :target => "_blank"

--- a/app/views/profile/_top_menu.html.haml
+++ b/app/views/profile/_top_menu.html.haml
-%div.top_project_menu
-  %span= link_to "Profile", profile_path, :class => current_page?(:controller => "profile", :action => :show) ? "current" : nil
-  %span= link_to "Password", profile_password_path, :style => "width:70px;", :class => current_page?(:controller => "profile", :action => :password) ? "current" : nil
-  %span= link_to "Keys", keys_path,  :class => controller.controller_name == "keys" ? "current" : nil
--- a/app/views/projects/_recent_messages.html.haml
+++ b/app/views/projects/_recent_messages.html.haml
@@ -40,7 +40,7 @@
      %p{:style => "margin-bottom: 3px;"}
        %span.author
          = note.author.name
-        = link_to truncate(note.note, :length => 200), link_to_item + "#note_#{note.id}"
+        = link_to markdown(truncate(note.note, :length => 200)), link_to_item + "#note_#{note.id}"
        - if note.attachment.url
          %br
          Attachment:

--- a/app/views/projects/_team.html.haml
+++ b/app/views/projects/_team.html.haml
@@ -2,7 +2,7 @@
  %div#new-member-holder
    = link_to "Add new", new_project_team_member_path(@project), :remote => true, :class => "lbutton vm"
 %table.round-borders#team-table
-  %tr
+  %thead
    %th Name
    %th Email
    %th Web

--- a/app/views/projects/_tile.html.haml
+++ b/app/views/projects/_tile.html.haml
 - @projects.in_groups_of(3, false) do |projects|
  - projects.each_with_index do |project, i|
-    %div{ :class => "project_thumb round-borders", :style => i == 2 ? "" : "margin-right:30px;" }
+    %div.grid_1
-      %div{ :class => "project", :url => project_path(project) }
+      %div{ :class => "project-box ui-box ui-box-big" }
-        %h2
+        = link_to project_path(project) do 
-          = image_tag gravatar_icon(project.name), :class => "left", :width => 40, :style => "padding-right:5px;"
+          %h3= project.name
-          = link_to ("/" + project.code), project_path(project), :style => "text-decoration:none"
+        .data
-        %p= project.name
+          %p.title.repository
-        %p= project.url_to_repo
+            %span Repository:
-        -#%p
+            = project.url_to_repo
-          Commit &ndash;
+          %p.title.activity
-          = last_commit(project)
+            %span Last Activity:
-        %hr
+            - last_note = project.notes.last
-        = link_to "Browse Code", tree_project_path(project), :class => "lbutton"
+            = last_note ? last_note.created_at.stamp("24 Aug, 2011") : "Never"
-        = link_to "Commits", project_commits_path(project), :class => "lbutton", :style => "float:right;width:80px;"
+        .buttons
-        .clear
+          %a.browse-code.button.yellow{:href => tree_project_path(project)} Browse code
+          %a.commits.button.green{:href => project_commits_path(project)} Commits
--- a/app/views/projects/_top_menu.html.haml
+++ b/app/views/projects/_top_menu.html.haml
 %div.top_project_menu
-  -#%span= link_to @project.code.capitalize, @project, :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil
  - if @project.repo_exists?
    %span= link_to image_tag("home.png", :width => 20), project_path(@project), :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil
    %span= link_to "Tree", tree_project_path(@project), :class => current_page?(:controller => "projects", :action => "tree", :id => @project) ? "current" : nil

--- a/app/views/projects/_tree.html.haml
+++ b/app/views/projects/_tree.html.haml
-%h3
+.left
-  .left
+  = form_tag tree_project_path(@project), :method => :get do
-    = form_tag tree_project_path(@project), :method => :get do
+    = select_tag "branch", options_for_select(@repo.heads.map(&:name), @branch), :onchange => "this.form.submit();", :class => "", :prompt => "Branches"
-      = select_tag "branch", options_for_select(@repo.heads.map(&:name), @branch), :onchange => "this.form.submit();", :class => "", :prompt => "Branches"
+.left
-  &nbsp;
+  = form_tag tree_project_path(@project), :method => :get do
-  .left.prepend-1
+    = select_tag "tag", options_for_select(@project.tags, @tag), :onchange => "this.form.submit();", :class => "", :prompt => "Tags"
-    = form_tag tree_project_path(@project), :method => :get do
+.clear
-      = select_tag "tag", options_for_select(@project.tags, @tag), :onchange => "this.form.submit();", :class => "", :prompt => "Tags"
-  = text_field_tag "ssh", @project.url_to_repo, :class => ["ssh_project_url","one_click_select"]
+%br
-  .clear
+-#%a.right.button{:href => "#"} Download
-%h3#tree-breadcrumbs
+-#-if can? current_user, :admin_project, @project
-  = link_to @project.name, tree_project_path(@project, :path => nil, :commit_id => @commit.try(:id)), :remote => true
+  %a.right.button.blue{:href => "#"} EDIT
-  - if params[:path]
+#tree-breadcrumbs
-    - part_path = ""
+  %h2.icon
-    - params[:path].split("\/").each do |part|
+    %span
-      - part_path = File.join(part_path, part) unless part_path.empty?
+    = link_to tree_project_path(@project, :path => nil, :commit_id => @commit.try(:id)), :remote => true, :class => 'project-name' do 
-      - if part_path.empty?
+      %i.arrow>
-        - part_path = part
+      = @project.name
-      \/
+    &nbsp;
-      = link_to truncate(part, :length => 40), tree_file_project_path(@project, :path => part_path, :commit_id => @commit.try(:id), :branch => @branch, :tag => @tag), :remote => :true
+    %d
+      %a{:href => "#"}
+        = @ref
+      - if params[:path]
+        - part_path = ""
+        - params[:path].split("\/").each do |part|
+          - part_path = File.join(part_path, part) unless part_path.empty?
+          - if part_path.empty?
+            - part_path = part
+          \/
+          = link_to truncate(part, :length => 40), tree_file_project_path(@project, :path => part_path, :commit_id => @commit.try(:id), :branch => @branch, :tag => @tag), :remote => :true
+.clear
 #tree-content-holder
  - if tree.is_a?(Grit::Blob)
    = render :partial => "projects/tree_file", :locals => { :name => tree.name, :content => tree.data, :file => tree }
  - else
    - contents = tree.contents
    %table#tree-slider.round-borders
-      %tr
+      %thead
        %th Name
        %th Last Update
        %th

--- a/app/views/projects/index.html.haml
+++ b/app/views/projects/index.html.haml
+- content_for(:body_class, "projects-page")
+- content_for(:page_title) do
+  .grid_4
+    - if current_user.can_create_project?
+      %a.grey-button.right{:href => new_project_path} Create new project
+    %h2.icon  
+      %span
+      Projects
 - unless @projects.empty?
  %div{:class => "tile", :style => view_mode_style("tile")}
    = render "tile"

--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -13,11 +13,11 @@
        = label_tag "week_view","Week"
  .clear
  %hr
-.span-11
+.left.width-49p
  %h3 Commits
  =render "projects/recent_commits"
-.span-11.right
+.right.width-49p
  %h3 Talk
  =render "projects/recent_messages"

--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -29,4 +29,5 @@ Gitlab::Application.configure do
  config.assets.debug = true
  config.action_mailer.default_url_options = { :host => 'localhost:3000' }
+  config.action_mailer.delivery_method = :letter_opener
 end
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -15,6 +15,7 @@ Gitlab::Application.routes.draw do
  put "profile/password", :to => "profile#password_update"
  put "profile/edit", :to => "profile#social_update"
  get "profile", :to => "profile#show"
+  get "dashboard", :to => "dashboard#index"
  #get "profile/:id", :to => "profile#show"
  resources :projects, :only => [:new, :create, :index]
@@ -53,5 +54,5 @@ Gitlab::Application.routes.draw do
    end
    resources :notes, :only => [:create, :destroy]
  end
-  root :to => "projects#index"
+  root :to => "dashboard#index"
 end
--- a/lib/commit_ext.rb
+++ b/lib/commit_ext.rb
@@ -8,4 +8,16 @@ module CommitExt
  rescue
    "-- invalid encoding for commit message"
  end
+  def created_at
+    committed_date
+  end
+  def author_email
+    author.email.force_encoding(Encoding::UTF_8)
+  end
+  def author_name
+    author.name.force_encoding(Encoding::UTF_8)
+  end
 end
--- a/public/apple-touch-icon-114x114-precomposed.png
+++ b/public/apple-touch-icon-114x114-precomposed.png
--- a/public/apple-touch-icon-57x57-precomposed.png
+++ b/public/apple-touch-icon-57x57-precomposed.png
--- a/public/apple-touch-icon-72x72-precomposed.png
+++ b/public/apple-touch-icon-72x72-precomposed.png
--- a/public/apple-touch-icon-precomposed.png
+++ b/public/apple-touch-icon-precomposed.png
--- a/public/apple-touch-icon.png
+++ b/public/apple-touch-icon.png
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -62,6 +62,51 @@ describe Project do
    end
  end
+  describe "updates" do 
+    let(:project) { Factory :project }
+    before do 
+      @issue = Factory :issue,
+        :project => project,
+        :author => Factory(:user),
+        :assignee => Factory(:user)
+      @note = Factory :note,
+        :project => project,
+        :author => Factory(:user)
+      @commit = project.fresh_commits(1).first
+    end
+    describe "return commit, note & issue" do
+      it { project.updates(3).count.should == 3 }
+      it { project.updates(3).last.id.should == @commit.id }
+      it { project.updates(3).include?(@issue).should be_true }
+      it { project.updates(3).include?(@note).should be_true }
+    end
+  end
+  describe "last_activity" do 
+    let(:project) { Factory :project }
+    before do 
+      @note = Factory :note,
+        :project => project,
+        :author => Factory(:user)
+    end
+    it { project.last_activity.should == @note }
+    it { project.last_activity_date.to_s.should == @note.created_at.to_s }
+  end
+  describe "fresh commits" do 
+    let(:project) { Factory :project }
+    it { project.fresh_commits(3).count.should == 3 }
+    it { project.fresh_commits.first.id.should == "2fb376f61875b58bceee0492e270e9c805294b1a" }
+    it { project.fresh_commits.last.id.should == "0dac878dbfe0b9c6104a87d65fe999149a8d862c" }
+  end
  describe "Git methods" do
    let(:project) { Factory :project }

--- a/spec/requests/dashboard_spec.rb
+++ b/spec/requests/dashboard_spec.rb
+require 'spec_helper'
+describe "Dashboard" do
+  before { login_as :user }
+  describe "GET /dashboard" do
+    before do
+      @project = Factory :project
+      @project.add_access(@user, :read, :write)
+      visit dashboard_path
+    end
+    it "should be on dashboard page" do
+      current_path.should == dashboard_path
+    end
+    it "should have projects panel" do
+      within ".project-list"  do 
+        page.should have_content(@project.name)
+      end
+    end
+    it "should have news feed" do
+      within "#news-feed"  do 
+        page.should have_content(@project.commit.author.name)
+        page.should have_content(@project.commit.safe_message)
+      end
+    end
+  end
+end
--- a/spec/requests/issues_spec.rb
+++ b/spec/requests/issues_spec.rb
@@ -5,7 +5,10 @@ describe "Issues" do
  before do
    login_as :user
+    @user2 = Factory :user
    project.add_access(@user, :read, :write)
+    project.add_access(@user2, :read, :write)
  end
  describe "GET /issues" do
@@ -49,20 +52,20 @@ describe "Issues" do
      end
      it "should show only open" do
-        should have_content(@issue.title)
+        should have_content(@issue.title[0..25])
        should have_no_content(@closed_issue.title)
      end
      it "should show only closed" do
        choose "closed_issues"
        should have_no_content(@issue.title)
-        should have_content(@closed_issue.title)
+        should have_content(@closed_issue.title[0..25])
      end
      it "should show all" do
        choose "all_issues"
-        should have_content(@issue.title)
+        should have_content(@issue.title[0..25])
-        should have_content(@closed_issue.title)
+        should have_content(@closed_issue.title[0..25])
      end
    end
  end
@@ -78,35 +81,66 @@ describe "Issues" do
    end
    describe "fill in" do
-      before do
+      describe 'assign to me' do 
-        fill_in "issue_title", :with => "bug 345"
+        before do
-        click_link "Select user"
+          fill_in "issue_title", :with => "bug 345"
-        click_link @user.name
+          click_link "Select user"
-      end
+          within "#issue_assignee_id-menu" do
+            click_link @user.name
-      it { expect { click_button "Save" }.to change {Issue.count}.by(1) }
+          end 
+        end
-      it "should add new issue to table" do
-        click_button "Save"
+        it { expect { click_button "Save" }.to change {Issue.count}.by(1) }
-        page.should_not have_content("Add new issue")
+        it "should add new issue to table" do
-        page.should have_content @user.name
+          click_button "Save"
-        page.should have_content "bug 345"
-        page.should have_content project.name
+          page.should_not have_content("Add new issue")
+          page.should have_content @user.name
+          page.should have_content "bug 345"
+          page.should have_content project.name
+        end
+        it "should call send mail" do
+          Notify.should_not_receive(:new_issue_email)
+          click_button "Save"
+        end
      end
-      it "should call send mail" do
+      describe 'assign to other' do 
-        Notify.should_receive(:new_issue_email).and_return(stub(:deliver => true))
+        before do
-        click_button "Save"
+          fill_in "issue_title", :with => "bug 345"
-      end
+          click_link "Select user"
+          within "#issue_assignee_id-menu" do
+            click_link @user2.name
+          end 
+        end
+        it { expect { click_button "Save" }.to change {Issue.count}.by(1) }
+        it "should add new issue to table" do
+          click_button "Save"
+          page.should_not have_content("Add new issue")
+          page.should have_content @user2.name
+          page.should have_content "bug 345"
+          page.should have_content project.name
+        end
+        it "should call send mail" do
+          Notify.should_receive(:new_issue_email).and_return(stub(:deliver => true))
+          click_button "Save"
+        end
+        it "should send valid email to user with email & password" do
+          click_button "Save"
+          issue = Issue.last
+          email = ActionMailer::Base.deliveries.last
+          email.subject.should have_content("New Issue was created")
+          email.body.should have_content(issue.title)
+          email.body.should have_content(issue.assignee.name)
+        end
-      it "should send valid email to user with email & password" do
-        click_button "Save"
-        issue = Issue.last
-        email = ActionMailer::Base.deliveries.last
-        email.subject.should have_content("New Issue was created")
-        email.body.should have_content(issue.title)
-        email.body.should have_content(issue.assignee.name)
      end
    end
  end

--- a/spec/requests/projects_spec.rb
+++ b/spec/requests/projects_spec.rb
@@ -13,14 +13,14 @@ describe "Projects" do
    end
    it "should have link to new project" do
-      page.should have_content("New Project")
+      page.should have_content("Create new project")
    end
  end
  describe "GET /projects/new" do
    before do
      visit projects_path
-      click_link "New Project"
+      click_link "Create new project"
    end
    it "should be correct path" do

--- a/spec/support/login.rb
+++ b/spec/support/login.rb
@@ -12,15 +12,15 @@ module LoginMacros
    end
    visit new_user_session_path
-    fill_in "Email", :with => @user.email
+    fill_in "user_email", :with => @user.email
-    fill_in "Password", :with => "123456"
+    fill_in "user_password", :with => "123456"
    click_button "Sign in"
  end
  def login_with(user)
    visit new_user_session_path
-    fill_in "Email", :with => user.email
+    fill_in "user_email", :with => user.email
-    fill_in "Password", :with => "123456"
+    fill_in "user_password", :with => "123456"
    click_button "Sign in"
  end

--- a/vendor/assets/stylesheets/jquery-ui/jquery-ui.css
+++ b/vendor/assets/stylesheets/jquery-ui/jquery-ui.css
@@ -445,7 +445,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 * http://docs.jquery.com/UI/Dialog#theming
 */
 .ui-dialog { position: absolute; padding: 0; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  background: #333; color:#eaeaea }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  background: #F7F7F7; color:#555; }
 .ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0;} 
 .ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; background:#eaeaea}
 .ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }