Commit 96152f17 authored by Filipa Lacerda's avatar Filipa Lacerda

Adds # back to deployment id

parent 3265518b
...@@ -4,6 +4,11 @@ ...@@ -4,6 +4,11 @@
overflow: auto; overflow: auto;
} }
.environments-list-loading {
width: 100%;
font-size: 34px;
}
.environments { .environments {
.deployment-column { .deployment-column {
.avatar { .avatar {
...@@ -58,13 +63,22 @@ ...@@ -58,13 +63,22 @@
} }
} }
} }
}
.table.ci-table.environments { .children-name{
margin-left: 17px;
margin-right: -17px;
}
.environment-children td:first-child { .folder-icon {
padding-left: 40px; padding: 0 5px 0 0;
}
.folder-name {
cursor: pointer;
} }
}
.table.ci-table.environments {
.icon-container { .icon-container {
width: 20px; width: 20px;
...@@ -76,13 +90,4 @@ ...@@ -76,13 +90,4 @@
margin-right: 0; margin-right: 0;
} }
} }
.environment-folder-name {
cursor: pointer;
}
}
.environments-list-loading {
width: 100%;
font-size: 34px;
} }
%script#environment-item-template{ "type"=> "text/x-template" } %script#environment-item-template{ "type"=> "text/x-template" }
%tr.environment %tr.environment
%td.environment-folder-name{ "@click" => "toggle" } %td.folder-name{ "@click" => "toggle" }
%a{ "v-if" => "!isFolder", %a{ "v-if" => "!isFolder",
":href" => "'#{namespace_project_environments_path(@project.namespace, @project)}/' + model.id" } ":href" => "'#{namespace_project_environments_path(@project.namespace, @project)}/' + model.id" }
{{model.name}} {{model.name}}
%span{ "v-if" => "isFolder" } %span{ "v-if" => "isFolder" }
%i{ "v-show" => "open" } %i.folder-icon{ "v-show" => "open" }
= icon("caret-down") = icon("caret-down")
%i{ "v-show" => "!open" } %i.folder-icon{ "v-show" => "!open" }
= icon("caret-right") = icon("caret-right")
{{model.name}} {{model.name}}
%td.deployment-column %td.deployment-column
%span{ "v-if" => "!isFolder && model.last_deployment && model.last_deployment.iid" } %span{ "v-if" => "!isFolder && model.last_deployment && model.last_deployment.iid" }
= precede '#' do
{{model.last_deployment.iid}} {{model.last_deployment.iid}}
%span{ "v-if" => "model.last_deployment.user" } %span{ "v-if" => "model.last_deployment.user" }
...@@ -52,17 +53,18 @@ ...@@ -52,17 +53,18 @@
-# = render "projects/environments/stop", environment: "{{model}}" -# = render "projects/environments/stop", environment: "{{model}}"
-# = render "projects/deployments/rollback", deployment: "{{model.last_deployment}}" -# = render "projects/deployments/rollback", deployment: "{{model.last_deployment}}"
%tr.environment-children{ "v-show" => "open", %tr{ "v-show" => "open",
"v-if"=>"isFolder", "v-if"=>"isFolder",
"v-for" => "child in model.children", "v-for" => "child in model.children",
":model" => "child" } ":model" => "child" }
%td %td
%a{ ":href" => "'#{namespace_project_environments_path(@project.namespace, @project)}/' + child.id" } %a.children-name{ ":href" => "'#{namespace_project_environments_path(@project.namespace, @project)}/' + child.id" }
{{child.name}} {{child.name}}
%td.deployment-column %td.deployment-column
%span{ "v-if" => "child.last_deployment && child.last_deployment.iid" } %span{ "v-if" => "child.last_deployment && child.last_deployment.iid" }
= precede '#' do
{{child.last_deployment.iid}} {{child.last_deployment.iid}}
%span{ "v-if" => "child.last_deployment.user" } %span{ "v-if" => "child.last_deployment.user" }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment