Skip to content

G
gitlab-ce
Commit ac13afbc authored by Kushal Pandya's avatar Kushal Pandya
Browse files
Options

Move New node form to separate route, update page layout and design

parent 8059bea3
Show whitespace changes
Inline Side-by-side
Showing with 81 additions and 62 deletions
app/views/admin/geo_nodes/index.html.haml
View file @ ac13afbc
- page_title 'Geo nodes' - page_title 'Geo nodes'
%h3.page-title - @content_class = "geo-admin-container"
%h2.page-title.clearfix
%span.title-text.pull-left
Geo Nodes Geo Nodes
= link_to "New node", new_admin_geo_node_path, class: 'btn btn-create pull-right'
%hr.page-title-separator
%p.light %p.page-subtitle.light
With #{link_to 'GitLab Geo', help_page_path('gitlab-geo/README'), class: 'vlink'} you can install a special With #{link_to 'GitLab Geo', help_page_path('gitlab-geo/README'), class: 'vlink'} you can install a special
read-only and replicated instance anywhere. read-only and replicated instance anywhere.
Before you add nodes, follow the Before you add nodes, follow the
...@@ -11,16 +15,6 @@ ...@@ -11,16 +15,6 @@
%strong exact order %strong exact order
they appear. they appear.
%hr
- if Gitlab::Geo.license_allows?
= form_for [:admin, @node], as: :geo_node, url: admin_geo_nodes_path, html: { class: 'form-horizontal js-geo-node-form' } do |f|
= render partial: 'form', locals: { form: f, geo_node: @node }
.form-actions
= f.submit 'Add Node', class: 'btn btn-create'
%hr
- if @nodes.any? - if @nodes.any?
.panel.panel-default .panel.panel-default
.panel-heading .panel-heading
...@@ -38,59 +32,84 @@ ...@@ -38,59 +32,84 @@
%span.help-block Primary node %span.help-block Primary node
- else - else
= status_loading_icon = status_loading_icon
- if node.restricted_project_ids %table.geo-node-status.js-geo-node-status.hidden
%p
%span.help-block
Namespaces to replicate:
%strong.node-info
= node_selected_namespaces_to_replicate(node)
.js-geo-node-status{ style: 'display: none' }
- if node.enabled? - if node.enabled?
%p %tr
%span.help-block %td
.help-block
Health Status: Health Status:
%span.js-health-status %td
%p .health-status.prepend-top-10.prepend-left-5.js-health-status
%span.help-block %tr
Repositories synced: %td
%strong.node-info.js-repositories-synced .help-block.prepend-top-10
%p Repositories:
%span.help-block %td
Repositories failed: .node-info.prepend-top-10.prepend-left-5.stacked-progress-bar.js-repositories
%strong.node-info.js-repositories-failed %span.status-unavailable.js-stats-unavailable
%p Not available
%span.help-block %span.status-green.js-synced
LFS objects synced: %span.status-neutral.js-waiting
%strong.node-info.js-lfs-objects-synced %span.status-red.js-failed
%p %tr
%span.help-block %td
LFS objects failed: .help-block.prepend-top-10
%strong.node-info.js-lfs-objects-failed LFS objects:
%p %td
%span.help-block .node-info.prepend-top-10.prepend-left-5.stacked-progress-bar.js-lfs-objects
Attachments synced: %span.status-unavailable.js-stats-unavailable
%strong.node-info.js-attachments-synced Not available
%p %span.status-green.js-synced
%span.help-block %span.status-neutral.js-waiting
Attachments failed: %span.status-red.js-failed
%strong.node-info.js-attachments-failed %tr
%p %td
.advanced-geo-node-status-container .help-block.prepend-top-10
.advanced-status.hidden Attachments:
%span.help-block %td
.node-info.prepend-top-10.prepend-left-5.stacked-progress-bar.js-attachments
%span.status-unavailable.js-stats-unavailable
Not available
%span.status-green.js-synced
%span.status-neutral.js-waiting
%span.status-red.js-failed
%tr
%td
.help-block.prepend-top-10
Sync settings:
%td
.node-info.prepend-top-10.prepend-left-5.js-sync-settings
%span.js-sync-type
%span.has-tooltip.sync-status.js-sync-status
%i.sync-status-icon.js-sync-status-icon
%span.sync-status-timestamp.js-sync-status-timestamp
%tr.js-advanced-status.hidden
%td
.help-block.prepend-top-10
Database replication lag: Database replication lag:
%strong.node-info.js-db-replication-lag %td
%span.help-block .node-info.prepend-top-10.prepend-left-5.js-db-replication-lag
%tr.js-advanced-status.hidden
%td
.help-block.prepend-top-10
Last event ID seen from primary: Last event ID seen from primary:
%strong.node-info.js-last-event-seen %td
%span.help-block .node-info.prepend-top-10.prepend-left-5.js-last-event-seen
%span.js-event-id
%span.event-timestamp.js-event-timestamp.has-tooltip
%tr.js-advanced-status.hidden
%td
.help-block.prepend-top-10
Last event ID processed by cursor: Last event ID processed by cursor:
%strong.node-info.js-last-cursor-event %td
%button.btn-link.js-advanced-geo-node-status-toggler .node-info.prepend-top-10.prepend-left-5.js-last-cursor-event
%span.js-event-id
%span.event-timestamp.js-event-timestamp.has-tooltip
%button.btn-link.advanced-geo-node-status-toggler.js-advanced-geo-node-status-toggler
%span> Advanced %span> Advanced
= icon('angle-down') %span.js-advance-toggle.show-advance-chevron.pull-right.inline.prepend-left-5
%p = sprite_icon('angle-down', css_class: 's16')
.js-health %p.health-message.hidden.js-health-message
- if Gitlab::Database.read_write? - if Gitlab::Database.read_write?
.node-actions .node-actions
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7