Branch merge

attract/application/modules/nodes/__init__.py

@@ -45,8 +45,8 @@ def index():
         shots=shots)
 
 
-@nodes.route("/create", methods=('GET', 'POST'))
-def create():
+@nodes.route("/add", methods=('GET', 'POST'))
+def add():
     form = NodeTypeForm()
 
     if form.validate_on_submit():
@@ -59,4 +59,4 @@ def create():
         db.session.commit()
 
         return redirect(url_for('nodes.index'))
-    return render_template('nodes/create.html', form=form)
+    return render_template('nodes/add.html', form=form)

attract/application/modules/shots/__init__.py

@@ -53,8 +53,8 @@ def view(shot_id):
         abort(404)
 
 
-@shots.route("/create", methods=('GET', 'POST'))
-def create():
+@shots.route("/add", methods=('GET', 'POST'))
+def add():
     form = ShotForm()
 
     if form.validate_on_submit():
@@ -72,7 +72,7 @@ def create():
         db.session.add(shot)
         db.session.commit()
         return redirect('/')
-    return render_template('shots/create.html', form=form)
+    return render_template('shots/add.html', form=form)
 
 
 @shots.route("/edit/<int:shot_id>", methods=('GET', 'POST'))

attract/application/templates/nodes/add.html

@@ -2,10 +2,10 @@
 
 {% block body %}
 <div class="col-md-9">
-  <h2>Create Node type</h2>
+  <h2>Add Node type</h2>
   <div class="row">
     <div class="col-md-6">
-      <form method="POST" action="{{url_for('nodes.create')}}">
+      <form method="POST" action="{{url_for('nodes.add')}}">
         {{ form.hidden_tag() }}
         <div class="form-group">
           {{ form.name.label }} 
@@ -23,7 +23,7 @@
           {{ form.is_extended.label }} 
           {{ form.is_extended(class='form-control') }}
         </div>
-        <input class="btn btn-default" type="submit" value="Create Node Type">
+        <input class="btn btn-default" type="submit" value="Add Node Type">
       </form>
     </div>
   </div>

attract/application/templates/nodes/index.html

@@ -44,7 +44,7 @@
   </div>
   <div class="row">
     <div class="col-md-12">
-      <a href="{{url_for('nodes.create')}}" class="btn btn-default">Create</a>
+      <a href="{{url_for('nodes.add')}}" class="btn btn-default">Add</a>
     </div>
   </div>
 </div>

attract/application/templates/shots/add.html

@@ -2,10 +2,10 @@
 
 {% block body %}
 <div class="col-md-9">
-  <h2>Create shot</h2>
+  <h2>Add shot</h2>
   <div class="row">
     <div class="col-md-6">
-      <form method="POST" action="{{url_for('shots.create')}}">
+      <form method="POST" action="{{url_for('shots.add')}}">
         {{ form.hidden_tag() }}
         <div class="form-group">
           {{ form.name.label }} 

attract/application/templates/shots/index.html

@@ -56,7 +56,7 @@
   </div>
   <div class="row">
     <div class="col-md-12">
-      <a href="{{url_for('shots.create')}}" class="btn btn-default">Create</a>
+      <a href="{{url_for('shots.add')}}" class="btn btn-default">Add</a>
     </div>
   </div>
 </div>