aboutsummaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authorFilipp Lepalaan <f@230.to>2014-06-06 18:15:38 +0300
committerFilipp Lepalaan <f@230.to>2014-06-06 18:15:38 +0300
commit13de2852294a911c24cee79c961ac4011fd13e88 (patch)
tree1c39fbd7e85539c7a81d6cd4cc9bc9ac05972fc9 /views
parent86a3727d8558974cbba2d7f6bc16a3dd5c0a7ac5 (diff)
downloadmembrain-13de2852294a911c24cee79c961ac4011fd13e88.tar.gz
membrain-13de2852294a911c24cee79c961ac4011fd13e88.tar.bz2
membrain-13de2852294a911c24cee79c961ac4011fd13e88.zip
Third commitHEADmaster
Diffstat (limited to 'views')
-rw-r--r--views/edit_object.erb24
-rw-r--r--views/layout.erb6
-rw-r--r--views/view_object.erb4
3 files changed, 29 insertions, 5 deletions
diff --git a/views/edit_object.erb b/views/edit_object.erb
index aa44acc..9c066aa 100644
--- a/views/edit_object.erb
+++ b/views/edit_object.erb
@@ -1,7 +1,29 @@
<form action="" method="post">
<div class="form-group">
<label for="exampleInputEmail1">Name</label>
- <input name="name" type="text" class="form-control" placeholder="Name" value="<%= @o.value %>">
+ <input name="title" type="text" class="form-control" placeholder="Name" value="<%= @o.title %>">
+ </div>
+ <div class="form-group">
+ <div class="row">
+ <div class="col-md-6">
+ <select class="form-control" name="keys[]">
+ <option>Lalala</option>
+ </select>
+ </div>
+ <div class="col-md-6">
+ <input class="form-control" type="text" name="values[]"></input>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-6">
+ <select class="form-control" name="keys[]">
+ <option>Bababaa</option>
+ </select>
+ </div>
+ <div class="col-md-6">
+ <input class="form-control" type="text" name="values[]"></input>
+ </div>
+ </div>
</div>
<button type="submit" class="btn btn-default">Submit</button>
</form>
diff --git a/views/layout.erb b/views/layout.erb
index a4d059b..386dad0 100644
--- a/views/layout.erb
+++ b/views/layout.erb
@@ -5,8 +5,10 @@
<link rel="stylesheet" href="/css/bootstrap-theme.min.css">
</head>
<body>
- <div id="app">
- <%= yield %>
+ <div class="container">
+ <div id="app">
+ <%= yield %>
+ </div>
</div>
</body>
<script src="/js/jquery.min.js"></script>
diff --git a/views/view_object.erb b/views/view_object.erb
index 20a58d7..24c4833 100644
--- a/views/view_object.erb
+++ b/views/view_object.erb
@@ -1,3 +1,3 @@
-<%= @data.title %>
+<h1><%= @object.title %></h1>
-<a class="btn btn-warning" href="<%= @data.get_url %>">Edit</a>
+<a class="btn btn-warning" href="<%= @object.get_url %>">Edit</a>