Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
6955c075
Commit
6955c075
authored
Jun 07, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
navless layout for new group/team. Proper title for this pages
parent
475da578
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
18 deletions
+29
-18
app/controllers/groups_controller.rb
app/controllers/groups_controller.rb
+7
-0
app/controllers/teams_controller.rb
app/controllers/teams_controller.rb
+6
-0
app/views/groups/new.html.haml
app/views/groups/new.html.haml
+9
-9
app/views/teams/new.html.haml
app/views/teams/new.html.haml
+7
-9
No files found.
app/controllers/groups_controller.rb
View file @
6955c075
...
@@ -12,6 +12,9 @@ class GroupsController < ApplicationController
...
@@ -12,6 +12,9 @@ class GroupsController < ApplicationController
# Load group projects
# Load group projects
before_filter
:projects
,
except:
[
:new
,
:create
]
before_filter
:projects
,
except:
[
:new
,
:create
]
layout
'navless'
,
only:
[
:new
,
:create
]
before_filter
:set_title
,
only:
[
:new
,
:create
]
def
new
def
new
@group
=
Group
.
new
@group
=
Group
.
new
end
end
...
@@ -134,4 +137,8 @@ class GroupsController < ApplicationController
...
@@ -134,4 +137,8 @@ class GroupsController < ApplicationController
return
render_404
return
render_404
end
end
end
end
def
set_title
@title
=
'New Group'
end
end
end
app/controllers/teams_controller.rb
View file @
6955c075
...
@@ -7,6 +7,8 @@ class TeamsController < ApplicationController
...
@@ -7,6 +7,8 @@ class TeamsController < ApplicationController
before_filter
:user_team
,
except:
[
:new
,
:create
]
before_filter
:user_team
,
except:
[
:new
,
:create
]
layout
'user_team'
,
except:
[
:new
,
:create
]
layout
'user_team'
,
except:
[
:new
,
:create
]
layout
'navless'
,
only:
[
:new
,
:create
]
before_filter
:set_title
,
only:
[
:new
,
:create
]
def
show
def
show
projects
projects
...
@@ -76,4 +78,8 @@ class TeamsController < ApplicationController
...
@@ -76,4 +78,8 @@ class TeamsController < ApplicationController
def
user_team
def
user_team
@team
||=
current_user
.
authorized_teams
.
find_by_path
(
params
[
:id
])
@team
||=
current_user
.
authorized_teams
.
find_by_path
(
params
[
:id
])
end
end
def
set_title
@title
=
'New Team'
end
end
end
app/views/groups/new.html.haml
View file @
6955c075
%h3
.page_title
New Group
%hr
=
form_for
@group
do
|
f
|
=
form_for
@group
do
|
f
|
-
if
@group
.
errors
.
any?
-
if
@group
.
errors
.
any?
.alert.alert-error
.alert.alert-error
...
@@ -15,14 +13,16 @@
...
@@ -15,14 +13,16 @@
.input
.input
=
f
.
text_area
:description
,
maxlength:
250
,
class:
"xxlarge js-gfm-input"
,
rows:
4
=
f
.
text_area
:description
,
maxlength:
250
,
class:
"xxlarge js-gfm-input"
,
rows:
4
.form-actions
.clearfix
=
f
.
submit
'Create group'
,
class:
"btn btn-create"
.input
.padded
%ul
%ul
%li
Group is kind of directory for several projects
%li
Group is kind of directory for several projects
%li
All created groups are private
%li
All created groups are private
%li
People within a group see only projects they have access to
%li
People within a group see only projects they have access to
%li
All projects of group will be stored in a group directory
%li
All projects of group will be stored in a group directory
%li
You will be able to move existing projects into group
%li
You will be able to move existing projects into group
.form-actions
=
f
.
submit
'Create group'
,
class:
"btn btn-create"
app/views/teams/new.html.haml
View file @
6955c075
%h3
.page_title
New Team
%hr
=
form_for
@team
,
url:
teams_path
do
|
f
|
=
form_for
@team
,
url:
teams_path
do
|
f
|
-
if
@team
.
errors
.
any?
-
if
@team
.
errors
.
any?
.alert.alert-error
.alert.alert-error
...
@@ -15,15 +13,15 @@
...
@@ -15,15 +13,15 @@
.input
.input
=
f
.
text_area
:description
,
maxlength:
250
,
class:
"xxlarge js-gfm-input"
,
rows:
4
=
f
.
text_area
:description
,
maxlength:
250
,
class:
"xxlarge js-gfm-input"
,
rows:
4
.form-actions
=
f
.
submit
'Create team'
,
class:
"btn btn-create"
.padded
.clearfix
.input
%ul
%ul
%li
All created teams are public (users can view who enter into team and which project are assigned for this team)
%li
All created teams are public (users can view who enter into team and which project are assigned for this team)
%li
People within a team see only projects they have access to
%li
People within a team see only projects they have access to
%li
You will be able to assign existing projects for team
%li
You will be able to assign existing projects for team
%hr
.form-actions
=
f
.
submit
'Create team'
,
class:
"btn btn-create"
-
if
current_user
.
can_create_group?
-
if
current_user
.
can_create_group?
.clearfix
.clearfix
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment