Showing 2 changed files with 165 additions and 52 deletions
+102 -6
public/css/bootstrap.css
... ...
@@ -17,7 +17,6 @@
17 17
     border:1px solid #d8d8d8;
18 18
     border-radius: 3px;
19 19
     padding:6px 5px;
20
-    width:100%;
21 20
     margin:5px 0;
22 21
     
23 22
     
... ...
@@ -36,6 +35,108 @@
36 35
   box-sizing: border-box;
37 36
 }
38 37
 
38
+.container {
39
+  width: 980px;
40
+  margin:0 auto;
41
+}
42
+
43
+.new-container {
44
+  width: 800px;
45
+  margin:0 auto;
46
+}
47
+
48
+.new-title-container {
49
+  border-bottom:1px solid #e5e5e5;
50
+  margin-top:40px;
51
+  margin-bottom:15px;
52
+}
53
+
54
+.new-readme {
55
+  border-bottom:1px solid #e5e5e5;
56
+  margin-bottom:16px;
57
+}
58
+
59
+.new-readme div:first-child {
60
+  font-weight:bold;
61
+}
62
+
63
+.new-readme div:first-child span {
64
+  padding-left:5px;
65
+}
66
+
67
+.new-readme > .last-child {
68
+  padding:0px 0px 15px 17px;
69
+  color:#767676;
70
+}
71
+
72
+.new-title {
73
+  font-weight:bold;
74
+  font-size:19px;
75
+  color:#333;
76
+  margin-bottom:5px;
77
+}
78
+
79
+.new-description {
80
+  color:#666;
81
+  margin-bottom:8px;
82
+}
83
+
84
+.new-private {
85
+  border-bottom:1px solid #e5e5e5;
86
+  margin-bottom:16px;
87
+}
88
+
89
+.new-private li {
90
+  padding:5px 0;
91
+}
92
+
93
+.new-private span {
94
+  font-weight:bold;
95
+  padding-left:5px;
96
+}
97
+
98
+.new-private .last-child {
99
+  color:#767676;
100
+  padding-left:17px;
101
+}
102
+
103
+.new-repository {
104
+  border-bottom:1px solid #e5e5e5;
105
+  margin-bottom:5px;
106
+}
107
+
108
+.new-repository .2th-child {
109
+
110
+}
111
+
112
+.new-repository .last-child {
113
+  margin-bottom:10px;
114
+}
115
+
116
+.new-repository .last-child input[type=text] {
117
+  border:1px solid #d8d8d8;
118
+  border-radius: 3px;
119
+  padding:6px 5px;
120
+  margin:5px 0;
121
+  width:100%;
122
+}
123
+
124
+.new-repository table {
125
+  margin-bottom:10px;
126
+}
127
+
128
+.new-repository td {
129
+  padding:0px 0;
130
+}
131
+
132
+.new-repository input[type=text] {
133
+  border:1px solid #d8d8d8;
134
+  border-radius: 3px;
135
+  padding:6px 5px;
136
+  margin:5px 0;
137
+  width:350px;
138
+}
139
+
39 140
 body {
40 141
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
41 142
   font-size: 14px;
... ...
@@ -98,11 +199,6 @@ body {
98 199
 /* Markdown */
99 200
 .markdown-body{padding:40px 40px;font-family:"Helvetica Neue", Helvetica, "Segoe UI", Arial, freesans, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";font-size:16px;line-height:1.6;word-wrap:break-word}.markdown-body:before{display:table;content:""}.markdown-body:after{display:table;clear:both;content:""}.markdown-body>*:first-child{margin-top:0 !important}.markdown-body>*:last-child{margin-bottom:0 !important}.markdown-body a:not([href]){color:inherit;text-decoration:none}.markdown-body .absent{color:#c00}.markdown-body .anchor{display:inline-block;padding-right:2px;margin-left:-18px}.markdown-body .anchor:focus{outline:none}.markdown-body h1,.markdown-body h2,.markdown-body h3,.markdown-body h4,.markdown-body h5,.markdown-body h6{margin-top:1em;margin-bottom:16px;font-weight:bold;line-height:1.4}.markdown-body h1 .octicon-link,.markdown-body h2 .octicon-link,.markdown-body h3 .octicon-link,.markdown-body h4 .octicon-link,.markdown-body h5 .octicon-link,.markdown-body h6 .octicon-link{color:#000;vertical-align:middle;visibility:hidden}.markdown-body h1:hover .anchor,.markdown-body h2:hover .anchor,.markdown-body h3:hover .anchor,.markdown-body h4:hover .anchor,.markdown-body h5:hover .anchor,.markdown-body h6:hover .anchor{text-decoration:none}.markdown-body h1:hover .anchor .octicon-link,.markdown-body h2:hover .anchor .octicon-link,.markdown-body h3:hover .anchor .octicon-link,.markdown-body h4:hover .anchor .octicon-link,.markdown-body h5:hover .anchor .octicon-link,.markdown-body h6:hover .anchor .octicon-link{visibility:visible}.markdown-body h1 tt,.markdown-body h1 code,.markdown-body h2 tt,.markdown-body h2 code,.markdown-body h3 tt,.markdown-body h3 code,.markdown-body h4 tt,.markdown-body h4 code,.markdown-body h5 tt,.markdown-body h5 code,.markdown-body h6 tt,.markdown-body h6 code{font-size:inherit}.markdown-body h1{padding-bottom:0.3em;font-size:2.25em;line-height:1.2;border-bottom:1px solid #eee}.markdown-body h1 .anchor{line-height:1}.markdown-body h2{padding-bottom:0.3em;font-size:1.75em;line-height:1.225;border-bottom:1px solid #eee}.markdown-body h2 .anchor{line-height:1}.markdown-body h3{font-size:1.5em;line-height:1.43}.markdown-body h3 .anchor{line-height:1.2}.markdown-body h4{font-size:1.25em}.markdown-body h4 .anchor{line-height:1.2}.markdown-body h5{font-size:1em}.markdown-body h5 .anchor{line-height:1.1}.markdown-body h6{font-size:1em;color:#777}.markdown-body h6 .anchor{line-height:1.1}.markdown-body p,.markdown-body blockquote,.markdown-body ul,.markdown-body ol,.markdown-body dl,.markdown-body table,.markdown-body pre{margin-top:0;margin-bottom:16px}.markdown-body hr{height:4px;padding:0;margin:16px 0;background-color:#e7e7e7;border:0 none}.markdown-body ul,.markdown-body ol{padding-left:2em}.markdown-body ul.no-list,.markdown-body ol.no-list{padding:0;list-style-type:none}.markdown-body ul ul,.markdown-body ul ol,.markdown-body ol ol,.markdown-body ol ul{margin-top:0;margin-bottom:0}.markdown-body li>p{margin-top:16px}.markdown-body dl{padding:0}.markdown-body dl dt{padding:0;margin-top:16px;font-size:1em;font-style:italic;font-weight:bold}.markdown-body dl dd{padding:0 16px;margin-bottom:16px}.markdown-body blockquote{padding:0 15px;color:#777;border-left:4px solid #ddd}.markdown-body blockquote>:first-child{margin-top:0}.markdown-body blockquote>:last-child{margin-bottom:0}.markdown-body table{display:block;width:100%;overflow:auto;word-break:normal;word-break:keep-all}.markdown-body table th{font-weight:bold}.markdown-body table th,.markdown-body table td{padding:6px 13px;border:1px solid #ddd}.markdown-body table tr{background-color:#fff;border-top:1px solid #ccc}.markdown-body table tr:nth-child(2n){background-color:#f8f8f8}.markdown-body img{max-width:100%;box-sizing:content-box;background-color:#fff}.markdown-body img[align=right]{padding-left:20px}.markdown-body img[align=left]{padding-right:20px}.markdown-body .emoji{max-width:none}.markdown-body span.frame{display:block;overflow:hidden}.markdown-body span.frame>span{display:block;float:left;width:auto;padding:7px;margin:13px 0 0;overflow:hidden;border:1px solid #ddd}.markdown-body span.frame span img{display:block;float:left}.markdown-body span.frame span span{display:block;padding:5px 0 0;clear:both;color:#333}.markdown-body span.align-center{display:block;overflow:hidden;clear:both}.markdown-body span.align-center>span{display:block;margin:13px auto 0;overflow:hidden;text-align:center}.markdown-body span.align-center span img{margin:0 auto;text-align:center}.markdown-body span.align-right{display:block;overflow:hidden;clear:both}.markdown-body span.align-right>span{display:block;margin:13px 0 0;overflow:hidden;text-align:right}.markdown-body span.align-right span img{margin:0;text-align:right}.markdown-body span.float-left{display:block;float:left;margin-right:13px;overflow:hidden}.markdown-body span.float-left span{margin:13px 0 0}.markdown-body span.float-right{display:block;float:right;margin-left:13px;overflow:hidden}.markdown-body span.float-right>span{display:block;margin:13px auto 0;overflow:hidden;text-align:right}.markdown-body code,.markdown-body tt{padding:0;padding-top:0.2em;padding-bottom:0.2em;margin:0;font-size:85%;background-color:rgba(0,0,0,0.04);border-radius:3px}.markdown-body code:before,.markdown-body code:after,.markdown-body tt:before,.markdown-body tt:after{letter-spacing:-0.2em;content:"\00a0"}.markdown-body code br,.markdown-body tt br{display:none}.markdown-body del code{text-decoration:inherit}.markdown-body pre>code{padding:0;margin:0;font-size:100%;word-break:normal;white-space:pre;background:transparent;border:0}.markdown-body .highlight{margin-bottom:16px}.markdown-body .highlight pre,.markdown-body pre{padding:16px;overflow:auto;font-size:85%;line-height:1.45;background-color:#f7f7f7;border-radius:3px}.markdown-body .highlight pre{margin-bottom:0;word-break:normal}.markdown-body pre{word-wrap:normal}.markdown-body pre code,.markdown-body pre tt{display:inline;max-width:initial;padding:0;margin:0;overflow:initial;line-height:inherit;word-wrap:normal;background-color:transparent;border:0}.markdown-body pre code:before,.markdown-body pre code:after,.markdown-body pre tt:before,.markdown-body pre tt:after{content:normal}.markdown-body kbd{display:inline-block;padding:3px 5px;font-size:11px;line-height:10px;color:#555;vertical-align:middle;background-color:#fcfcfc;border:solid 1px #ccc;border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.markdown-body blockquote{padding:0 0 0 40px;border:0 none}
100 201
 
101
-.container {
102
-  width: 980px;
103
-  margin:0 auto;
104
-}
105
-
106 202
 ul {
107 203
   padding: 0;
108 204
   margin: 0;;
+63 -46
templates/auto/_new.html.ep
... ...
@@ -50,6 +50,7 @@
50 50
       $description = '' unless defined $description;
51 51
       my $readme = $data->{readme};
52 52
       my $private = $data->{private};
53
+      $private ||= 0;
53 54
       
54 55
       my $manager = app->manager;
55 56
       if ($manager->exists_project($session_user, $project)) {
... ...
@@ -83,7 +84,7 @@
83 84
 
84 85
   %= include '/include/header', no_project_header => 1;
85 86
   
86
-  <div class="container">
87
+  <div class="new-container">
87 88
     % if ($errors) {
88 89
       <div class="alert alert-error">
89 90
         <button type="button" class="close" data-dismiss="alert">&times;</button>
... ...
@@ -92,60 +93,76 @@
92 93
         % }
93 94
       </div>
94 95
     % }
95
-    <div style="border-bottom:1px solid #e5e5e5;margin-top:40px;margin-bottom:20px;">
96
-      <div style="font-weight:bold;font-size:18px;color:#333;margin-bottom:3px;">
96
+    <div class="new-title-container">
97
+      <div class="new-title">
97 98
         Create a new repository
98 99
       </div>
99
-      <div style="color:#666;margin-bottom:5px;">
100
+      <div class="new-description">
100 101
         A repository contains all the files for your project, including the revision history.
101 102
       </div>
102 103
     </div>
103 104
     <form action="<%= url_for->query(op => 'create') %>" method="post">
104
-      <table>
105
-        <tr>
106
-          <td>
107
-            <b>Owner</b>
108
-          </td>
109
-          <td>
110
-          
111
-          </td>
112
-          <td>
113
-            <b>Repository name</b>
114
-          </td>
115
-        </tr>
116
-        <tr>
117
-          <td>
118
-            <i class="icon-user"></i><%= $session_user %>
119
-          </td>
120
-          <td style="padding:0 10px">
121
-            /
122
-          </td>
123
-          <td>
124
-            <%= input_tag 'project', type => 'text', style => 'width:300px' %>
125
-          </td>
126
-        </tr>
127
-      </table>
128
-      <div style="margin-bottom:20px">
129
-        Great repository names are short and memorable.
105
+      <div class="new-repository">
106
+        <table>
107
+          <tr>
108
+            <td>
109
+              <b>Owner</b>
110
+            </td>
111
+            <td>
112
+            
113
+            </td>
114
+            <td>
115
+              <b>Repository name</b>
116
+            </td>
117
+          </tr>
118
+          <tr>
119
+            <td>
120
+              <i class="icon-user"></i><%= $session_user %>
121
+            </td>
122
+            <td style="padding:0 10px">
123
+              /
124
+            </td>
125
+            <td>
126
+              <%= text_field 'project'%>
127
+            </td>
128
+          </tr>
129
+        </table>
130
+        <div class="2th-child">
131
+          <b>Description</b> <span style="color:#767676">(optional)</span>
132
+        </div>
133
+        <div class="last-child">
134
+          <%= text_field 'description' %>
135
+        </div>
130 136
       </div>
131
-
132
-      <div><b>Description</b> (optional)</div>
133
-      <div><%= input_tag 'description', type => 'text', style => 'width:600px' %></div>
137
+      <ul class="new-private">
138
+        <li>
139
+          <div>
140
+            <%= radio_button private => 0, checked => undef %><span>Public</span>
141
+          </div>
142
+          <div class="last-child">
143
+            Anyone can see this repository. You choose who can commit.
144
+          </div>
145
+        </li>
146
+        <li>
147
+          <div>
148
+            <%= radio_button private => 1 %><span>Private</span>
149
+          </div>
150
+          <div class="last-child">
151
+            You choose who can see and commit to this repository.
152
+          </div>
153
+        </li>
154
+      </ul>
134 155
       
135
-      <div>
136
-        <label class="checkbox" style="margin-bottom:0">
137
-          <%= check_box readme => 1 %><b>Initialize this $session_usertory with a README</b>
138
-        </label>
139
-      </div>
140
-      <div class="muted" style="margin-left:20px">This will allow you to git clone the repository immediately.</div>
141
-
142
-      <div>
143
-        <label class="checkbox" style="margin-bottom:0">
144
-          <%= check_box private => 1 %><b>Make this repository private </b>
145
-        </label>
156
+      <div class="new-readme">
157
+        <div>
158
+          <%= check_box readme => 1 %><span>Initialize this this repository with a README<span>
159
+        </div>
160
+        <div class="last-child">
161
+          This will let you immediately clone the repository to your computer. Skip this step if you’re importing an existing repository.
162
+        </div>
146 163
       </div>
147
-            
148
-      <input style="margin-top:10px" type="submit" class="btn" value="Create repository">
164
+      
165
+      <input type="submit" class="btn btn-success" value="Create repository">
149 166
     </form>
150 167
   </div>
151 168
   %= include '/include/footer';