summaryrefslogtreecommitdiff
path: root/app/views/gs_nodes
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-22 15:33:06 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-22 15:33:06 +0100
commit39aa7132ceed3d4beab3a9b828e571bbfc67c07e (patch)
tree6c88289c9f99be0af8635636fcdf64102090e5ec /app/views/gs_nodes
parent5ad8203ce4f1bfea997960d0b52c626dea24b944 (diff)
parent6f69c1a85055ec7c2515719d79d2a7a4e60cec50 (diff)
Merge branch 'develop'5.1-beta1
Diffstat (limited to 'app/views/gs_nodes')
-rw-r--r--app/views/gs_nodes/_index_core.html.haml6
-rw-r--r--app/views/gs_nodes/edit.html.haml2
-rw-r--r--app/views/gs_nodes/index.html.haml2
-rw-r--r--app/views/gs_nodes/new.html.haml2
-rw-r--r--app/views/gs_nodes/show.html.haml2
5 files changed, 7 insertions, 7 deletions
diff --git a/app/views/gs_nodes/_index_core.html.haml b/app/views/gs_nodes/_index_core.html.haml
index 72633e1..0f1a51c 100644
--- a/app/views/gs_nodes/_index_core.html.haml
+++ b/app/views/gs_nodes/_index_core.html.haml
@@ -1,4 +1,4 @@
-%table
+%table{:class => 'table table-striped'}
%tr
%th= t('gs_nodes.index.name')
%th= t('gs_nodes.index.ip_address')
@@ -7,9 +7,9 @@
%th= t('gs_nodes.index.push_updates_to')
%th= t('gs_nodes.index.accepts_updates_from')
- - reset_cycle
+
- for gs_node in gs_nodes
- %tr{:class => cycle('odd', 'even')}
+ %tr
%td= gs_node.name
%td= gs_node.ip_address
%td= gs_node.site
diff --git a/app/views/gs_nodes/edit.html.haml b/app/views/gs_nodes/edit.html.haml
index c025b05..55180f3 100644
--- a/app/views/gs_nodes/edit.html.haml
+++ b/app/views/gs_nodes/edit.html.haml
@@ -1,3 +1,3 @@
-- title t("gs_nodes.edit.page_title")
+- content_for :title, t("gs_nodes.edit.page_title")
= render "form" \ No newline at end of file
diff --git a/app/views/gs_nodes/index.html.haml b/app/views/gs_nodes/index.html.haml
index 4670cef..2c4ba0b 100644
--- a/app/views/gs_nodes/index.html.haml
+++ b/app/views/gs_nodes/index.html.haml
@@ -1,4 +1,4 @@
-- title t("gs_nodes.index.page_title")
+- content_for :title, t("gs_nodes.index.page_title")
- if @gs_nodes && @gs_nodes.count > 0
= render "index_core", :gs_nodes => @gs_nodes
diff --git a/app/views/gs_nodes/new.html.haml b/app/views/gs_nodes/new.html.haml
index 230ce33..8425084 100644
--- a/app/views/gs_nodes/new.html.haml
+++ b/app/views/gs_nodes/new.html.haml
@@ -1,3 +1,3 @@
-- title t("gs_nodes.new.page_title")
+- content_for :title, t("gs_nodes.new.page_title")
= render "form" \ No newline at end of file
diff --git a/app/views/gs_nodes/show.html.haml b/app/views/gs_nodes/show.html.haml
index ca70a50..bccf785 100644
--- a/app/views/gs_nodes/show.html.haml
+++ b/app/views/gs_nodes/show.html.haml
@@ -1,4 +1,4 @@
-- title t("gs_nodes.show.page_title")
+- content_for :title, t("gs_nodes.show.page_title")
%p
%strong= t('gs_nodes.show.name') + ":"