Merge branch 'dev' into user_dashboard
Conflicts: app/views/layouts/_head_panel.html.erb
This commit is contained in:
gitlabhq
commit
e9b22a2def
41 changed files with 1075 additions and 234 deletions
|
|
@ -1,4 +1,4 @@
|
|||
[Dolphin]
|
||||
ShowPreview=true
|
||||
Timestamp=2011,9,14,20,34,18
|
||||
Timestamp=2011,10,28,13,16,25
|
||||
Version=2
|
||||
|
|
|
|||
BIN
app/assets/images/bg-header.png
Normal file
BIN
app/assets/images/bg-header.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 212 B |
BIN
app/assets/images/icon-search.png
Normal file
BIN
app/assets/images/icon-search.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 422 B |
BIN
app/assets/images/images.png
Normal file
BIN
app/assets/images/images.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.5 KiB |
BIN
app/assets/images/login-logo.png
Normal file
BIN
app/assets/images/login-logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
4
app/assets/javascripts/modernizr-2.0.6.min.js
vendored
Executable file
4
app/assets/javascripts/modernizr-2.0.6.min.js
vendored
Executable file
File diff suppressed because one or more lines are too long
|
|
@ -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 {
|
||||
background: #eaeaea;
|
||||
}
|
||||
//body {
|
||||
//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;
|
||||
border-color: #FFD324;
|
||||
color: #514721;
|
||||
border: 1px solid #DDDDDD;
|
||||
background: none repeat scroll 0 0 white;
|
||||
color: #333;
|
||||
border-color: #4BB8D2;
|
||||
padding: 2px;
|
||||
font-size:12px;
|
||||
position:relative;
|
||||
top:-14px;
|
||||
left:10px;
|
||||
font-size:10px;
|
||||
border-top:none;
|
||||
text-align:center;
|
||||
float:right;
|
||||
width:25px;
|
||||
|
||||
|
||||
}
|
||||
|
||||
#logo {
|
||||
|
|
@ -429,6 +377,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
|
|||
color:#444;
|
||||
font-size:22px;
|
||||
padding-top:5px;
|
||||
margin:2px;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -700,6 +649,60 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
|
|||
}
|
||||
}
|
||||
|
||||
.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;
|
||||
}
|
||||
|
|
|
|||
660
app/assets/stylesheets/style.scss
Executable file
660
app/assets/stylesheets/style.scss
Executable file
|
|
@ -0,0 +1,660 @@
|
|||
/* 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; }
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ require "base64"
|
|||
|
||||
class CommitsController < ApplicationController
|
||||
before_filter :project
|
||||
layout "project"
|
||||
|
||||
# Authorize
|
||||
before_filter :add_project_abilities
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
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
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
class SnippetsController < ApplicationController
|
||||
before_filter :authenticate_user!
|
||||
before_filter :project
|
||||
layout "project"
|
||||
|
||||
# Authorize
|
||||
before_filter :add_project_abilities
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
class TeamMembersController < ApplicationController
|
||||
before_filter :project
|
||||
layout "project"
|
||||
|
||||
# Authorize
|
||||
before_filter :add_project_abilities
|
||||
|
|
|
|||
|
|
@ -1,22 +1,25 @@
|
|||
- @commits.group_by { |c| c.committed_date.to_date }.each do |day, commits|
|
||||
.day-commits-table
|
||||
.day-header
|
||||
%div{ :class => "commits-date ui-box ui-box-small ui-box-big" }
|
||||
.day-commits-table
|
||||
%h3= day.stamp("28 Aug, 2010")
|
||||
%ul
|
||||
- commits.each do |commit|
|
||||
%li{ :class => "commit", :url => project_commit_path(@project, :id => commit.id) }
|
||||
- if commit.author.email
|
||||
= image_tag gravatar_icon(commit.author.email), :class => "left", :width => 40, :style => "padding-right:5px;"
|
||||
- else
|
||||
= image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
|
||||
%p
|
||||
%strong
|
||||
= truncate(commit.safe_message, :length => 60)
|
||||
= link_to "Browse Code", tree_project_path(@project, :commit_id => commit.id), :class => "lite_button", :style => "float:right"
|
||||
= link_to truncate(commit.id.to_s, :length => 16), project_commit_path(@project, :id => commit.id), :class => "lite_button", :style => "width:120px;float:right"
|
||||
%span
|
||||
%span.author
|
||||
= commit.author
|
||||
= time_ago_in_words(commit.committed_date)
|
||||
ago
|
||||
.data
|
||||
- commits.each do |commit|
|
||||
%a{ :class => "commit", :href => project_commit_path(@project, :id => commit.id) }
|
||||
%span.commit-info
|
||||
%data.commit-button
|
||||
= truncate(commit.id.to_s, :length => 16)
|
||||
%i
|
||||
%data.commit-browse{ :onclick => "location.href='#{tree_project_path(@project, :commit_id => commit.id)}';return false;"}
|
||||
Browse Code
|
||||
- if commit.author.email
|
||||
= image_tag gravatar_icon(commit.author.email), :class => "left", :width => 40, :style => "padding-right:5px;"
|
||||
- else
|
||||
= image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
|
||||
%span.commit-title
|
||||
%strong
|
||||
= truncate(commit.safe_message, :length => 60)
|
||||
%span.commit-author
|
||||
%strong= commit.author
|
||||
= time_ago_in_words(commit.committed_date)
|
||||
ago
|
||||
= more_commits_link if @commits.size > 99
|
||||
|
|
|
|||
|
|
@ -1,15 +1,33 @@
|
|||
%div
|
||||
%h3
|
||||
.left
|
||||
= 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"
|
||||
|
||||
.left.prepend-1
|
||||
= 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"
|
||||
= text_field_tag "ssh", @project.url_to_repo, :class => ["ssh_project_url", "one_click_select"]
|
||||
.clear
|
||||
- content_for(:body_class, "project-page commits-page")
|
||||
|
||||
.left
|
||||
= 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"
|
||||
.left
|
||||
= 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"
|
||||
.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
|
||||
|
||||
%d
|
||||
%a{:href => "#"}
|
||||
= @ref
|
||||
- if params[:path]
|
||||
%h3{:style => "color:#555"} /#{params[:path]}
|
||||
%div{:id => dom_id(@project)}
|
||||
= render "commits"
|
||||
|
||||
%d
|
||||
%a{:href => "#"}= params[:path].split("/").join(" / ")
|
||||
|
||||
|
||||
%div{:id => dom_id(@project)}
|
||||
= render "commits"
|
||||
|
|
|
|||
|
|
@ -1,15 +1,8 @@
|
|||
<h2>Forgot your password?</h2>
|
||||
|
||||
<div class="span-12 colborder">
|
||||
<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
|
||||
<%= devise_error_messages! %>
|
||||
|
||||
<div><%= f.label :email %><br />
|
||||
<%= f.email_field :email %></div>
|
||||
|
||||
<div><%= f.submit "Send me reset password instructions", :class => "lbutton vm" %></div>
|
||||
<% end %>
|
||||
</div>
|
||||
<div>
|
||||
<%= render :partial => "devise/shared/links" %>
|
||||
</div>
|
||||
<%= 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" %>
|
||||
<%= devise_error_messages! %>
|
||||
<%= f.email_field :email, :placeholder => "Email", :class => "text top" %>
|
||||
<br/>
|
||||
<%= f.submit "Reset password", :class => "grey-button" %>
|
||||
<div class="right"> <%= render :partial => "devise/shared/links" %></div>
|
||||
<% end %>
|
||||
|
|
|
|||
|
|
@ -1,20 +1,12 @@
|
|||
<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">
|
||||
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
|
||||
<div><%= f.label :email %><br />
|
||||
<%= f.text_field :email %></div>
|
||||
|
||||
<div><%= f.label :password %><br />
|
||||
<%= f.password_field :password %></div>
|
||||
|
||||
<% 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>
|
||||
<% if devise_mapping.rememberable? -%>
|
||||
<div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
|
||||
<% end -%>
|
||||
<br/>
|
||||
<%= f.submit "Sign in", :class => "grey-button" %>
|
||||
<div class="right"> <%= render :partial => "devise/shared/links" %></div>
|
||||
<% end %>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
%table.round-borders#issues-table
|
||||
%tr
|
||||
%thead
|
||||
- if can?(current_user, :admin_issue, @project) && !params[:f] || params[:f] == "0"
|
||||
%th
|
||||
%th Assignee
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
%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
|
||||
|
|
|
|||
|
|
@ -1,23 +1,43 @@
|
|||
<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( admin_root_path, :class => admin_namespace? ? "current admin" : "admin" ) do %>
|
||||
<span></span>Admin
|
||||
<% end if current_user.is_admin? %>
|
||||
</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 'Dashboard', dashboard_path, :class => current_page?(dashboard_path) ? "current button" : "button" %>
|
||||
<%= 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>
|
||||
|
|
|
|||
2
app/views/layouts/_page_title.html.haml
Normal file
2
app/views/layouts/_page_title.html.haml
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
- if content_for?(:page_title)
|
||||
= yield :page_title
|
||||
|
|
@ -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/print', :media => "print"
|
||||
= 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/screen', :media => "screen, projection"
|
||||
-#= stylesheet_link_tag 'blueprint/print', :media => "print"
|
||||
-#= stylesheet_link_tag 'blueprint/plugins/buttons/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,16 @@
|
|||
= javascript_tag do
|
||||
REQ_URI = "#{request.env["REQUEST_URI"]}";
|
||||
REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
|
||||
%body#thebody
|
||||
= render :partial => "layouts/flash"
|
||||
- if user_signed_in?
|
||||
%body{ :class => yield(:body_class), :id => yield(:boyd_id)}
|
||||
#container
|
||||
= render :partial => "layouts/flash"
|
||||
= render :partial => "layouts/head_panel"
|
||||
.top_bar.container
|
||||
= render :partial => "projects/top_menu" if @project && !@project.new_record?
|
||||
= 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
|
||||
%div{ :id => "main", :role => "main", :class => "container_4" }
|
||||
- if @project && !@project.new_record?
|
||||
.top_bar.container= render :partial => "projects/top_menu"
|
||||
- if ["keys", "profile"].include?(controller.controller_name)
|
||||
.top_bar.container= render :partial => "profile/top_menu"
|
||||
- if admin_namespace?
|
||||
.top_bar.container= render :partial => "admin/top_menu"
|
||||
= render :partial => "layouts/page_title"
|
||||
= yield
|
||||
|
|
|
|||
15
app/views/layouts/devise.html.haml
Normal file
15
app/views/layouts/devise.html.haml
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
!!!
|
||||
%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
|
||||
45
app/views/layouts/project.html.haml
Normal file
45
app/views/layouts/project.html.haml
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
!!!
|
||||
%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
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,16 +1,17 @@
|
|||
- @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{ :class => "project", :url => project_path(project) }
|
||||
%h2
|
||||
= image_tag gravatar_icon(project.name), :class => "left", :width => 40, :style => "padding-right:5px;"
|
||||
= link_to ("/" + project.code), project_path(project), :style => "text-decoration:none"
|
||||
%p= project.name
|
||||
%p= project.url_to_repo
|
||||
-#%p
|
||||
Commit –
|
||||
= last_commit(project)
|
||||
%hr
|
||||
= link_to "Browse Code", tree_project_path(project), :class => "lbutton"
|
||||
= link_to "Commits", project_commits_path(project), :class => "lbutton", :style => "float:right;width:80px;"
|
||||
.clear
|
||||
%div.grid_1
|
||||
%div{ :class => "project-box ui-box ui-box-big" }
|
||||
= link_to project_path(project) do
|
||||
%h3= project.name
|
||||
.data
|
||||
%p.title.repository
|
||||
%span Repository:
|
||||
= project.url_to_repo
|
||||
%p.title.activity
|
||||
%span Last Activity:
|
||||
- last_note = project.notes.last
|
||||
= last_note ? last_note.created_at.stamp("24 Aug, 2011") : "Never"
|
||||
.buttons
|
||||
%a.browse-code.button.yellow{:href => tree_project_path(project)} Browse code
|
||||
%a.commits.button.green{:href => project_commits_path(project)} Commits
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
%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
|
||||
|
|
|
|||
|
|
@ -1,31 +1,45 @@
|
|||
%h3
|
||||
.left
|
||||
= 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"
|
||||
|
||||
.left.prepend-1
|
||||
= form_tag tree_project_path(@project), :method => :get do
|
||||
= 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"]
|
||||
.clear
|
||||
.left
|
||||
= 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"
|
||||
.left
|
||||
= form_tag tree_project_path(@project), :method => :get do
|
||||
= select_tag "tag", options_for_select(@project.tags, @tag), :onchange => "this.form.submit();", :class => "", :prompt => "Tags"
|
||||
.clear
|
||||
|
||||
%br
|
||||
|
||||
-#%a.right.button{:href => "#"} Download
|
||||
-#-if can? current_user, :admin_project, @project
|
||||
%a.right.button.blue{:href => "#"} EDIT
|
||||
#tree-breadcrumbs
|
||||
%h2.icon
|
||||
%span
|
||||
= link_to tree_project_path(@project, :path => nil, :commit_id => @commit.try(:id)), :remote => true, :class => 'project-name' do
|
||||
%i.arrow>
|
||||
= @project.name
|
||||
|
||||
%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
|
||||
|
||||
%h3#tree-breadcrumbs
|
||||
= link_to @project.name, tree_project_path(@project, :path => nil, :commit_id => @commit.try(:id)), :remote => true
|
||||
- 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
|
||||
#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
|
||||
|
|
|
|||
|
|
@ -1,3 +1,12 @@
|
|||
- 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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
BIN
public/apple-touch-icon-114x114-precomposed.png
Executable file
BIN
public/apple-touch-icon-114x114-precomposed.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 1 KiB |
BIN
public/apple-touch-icon-57x57-precomposed.png
Executable file
BIN
public/apple-touch-icon-57x57-precomposed.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 640 B |
BIN
public/apple-touch-icon-72x72-precomposed.png
Executable file
BIN
public/apple-touch-icon-72x72-precomposed.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 747 B |
BIN
public/apple-touch-icon-precomposed.png
Executable file
BIN
public/apple-touch-icon-precomposed.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 640 B |
BIN
public/apple-touch-icon.png
Executable file
BIN
public/apple-touch-icon.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 640 B |
BIN
public/favicon.ico
Normal file → Executable file
BIN
public/favicon.ico
Normal file → Executable file
Binary file not shown.
|
Before Width: | Height: | Size: 0 B After Width: | Height: | Size: 1.1 KiB |
|
|
@ -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(@closed_issue.title)
|
||||
should have_content(@issue.title[0..25])
|
||||
should have_content(@closed_issue.title[0..25])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -78,35 +81,71 @@ describe "Issues" do
|
|||
end
|
||||
|
||||
describe "fill in" do
|
||||
before do
|
||||
fill_in "issue_title", :with => "bug 345"
|
||||
click_link "Select user"
|
||||
click_link @user.name
|
||||
describe 'assign to me' do
|
||||
before do
|
||||
fill_in "issue_title", :with => "bug 345"
|
||||
click_link "Select user"
|
||||
within "#issue_assignee_id-menu" do
|
||||
click_link @user.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 @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
|
||||
|
||||
it "should send valid email to user with email & password" do
|
||||
click_button "Save"
|
||||
ActionMailer::Base.deliveries.last.should be_nil
|
||||
end
|
||||
end
|
||||
|
||||
it { expect { click_button "Save" }.to change {Issue.count}.by(1) }
|
||||
describe 'assign to other' do
|
||||
before do
|
||||
fill_in "issue_title", :with => "bug 345"
|
||||
click_link "Select user"
|
||||
within "#issue_assignee_id-menu" do
|
||||
click_link @user2.name
|
||||
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")
|
||||
page.should have_content @user.name
|
||||
page.should have_content "bug 345"
|
||||
page.should have_content project.name
|
||||
end
|
||||
it "should add new issue to table" do
|
||||
click_button "Save"
|
||||
|
||||
it "should call send mail" do
|
||||
Notify.should_receive(:new_issue_email).and_return(stub(:deliver => true))
|
||||
click_button "Save"
|
||||
end
|
||||
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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -12,15 +12,15 @@ module LoginMacros
|
|||
end
|
||||
|
||||
visit new_user_session_path
|
||||
fill_in "Email", :with => @user.email
|
||||
fill_in "Password", :with => "123456"
|
||||
fill_in "user_email", :with => @user.email
|
||||
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 "Password", :with => "123456"
|
||||
fill_in "user_email", :with => user.email
|
||||
fill_in "user_password", :with => "123456"
|
||||
click_button "Sign in"
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -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; }
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue