html changes, clean up

UncSald · Dec 11, 2024 · 88ec709 · 88ec709
1 parent 923f819
commit 88ec709
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 41 deletions.
diff --git a/src/story_tests/reference_edit.robot b/src/story_tests/reference_edit.robot
@@ -11,7 +11,7 @@ Created Reference Should Editable After Creation
     ${normal}=  Run Keyword And Return Status    Element Should Be Visible   id=view_normal_format
     Run Keyword If    ${normal}    Click Normal Button If Shown
     Page Should Contain  Article_Kirjoittaja
-    Click Link  edit_reference
+    Click Element  edit_reference
     Clear Element Text  author
     Set Author  Uusi_kirjoittaja
     Scroll Element Into View  article_update

diff --git a/src/templates/index.html b/src/templates/index.html
@@ -6,12 +6,9 @@
 
 {% block body %}
 
-
-
-<div class="container">
+<div class="container" style="padding-top: 30px;">
   <div class="row">
     <div class="col-8">
-      <h2>References</h2>
       <a type="button" class="btn btn-primary" href="/new_reference" name="new_reference">
         Create new reference
       </a>

diff --git a/src/templates/layout.html b/src/templates/layout.html
@@ -30,7 +30,6 @@
         </div>
       </nav>
     </div>
-    <hr>
     {% block body %}
 
     {% endblock %}

diff --git a/src/templates/new_reference.html b/src/templates/new_reference.html
@@ -6,21 +6,26 @@
 
 {% block body %}
 
-<div class="container">
+<div class="container" style="padding-top: 30px;">
     <div class="row">
         <div class="col-8">
-            <h1>Create a reference</h1>
-            <label>
-                <input id="result" type="radio" name="refTypeCheckbox" value="article" onclick="openForm()">Article
+            <h2>Create a reference</h2>
+            <input class="form-check-input" id="result" type="radio" name="refTypeCheckbox" value="article" onclick="openForm()">
+            <label class="form-check-label" for="exampleRadios1" style="padding-right: 5px;">
+                Article
+            </label>
+            <input class="form-check-input" id="result" type="radio" name="refTypeCheckbox" value="book" onclick="openForm()">
+            <label class="form-check-label" for="exampleRadios1" style="padding-right: 5px;">
+                Book
             </label>
-            <label>
-                <input id="result" type="radio" name="refTypeCheckbox" value="book" onclick="openForm()">Book
+            <input class="form-check-input" id="result" type="radio" name="refTypeCheckbox" value="misc" onclick="openForm()">
+            <label class="form-check-label" for="exampleRadios1" style="padding-right: 5px;">
+                Misc
             </label>
-            <label>
-                <input id="result" type="radio" name="refTypeCheckbox" value="misc" onclick="openForm()">Misc
+            <input class="form-check-input" id="result" type="radio" name="refTypeCheckbox" value="acm" onclick="openForm()">
+            <label class="form-check-label" for="exampleRadios1" style="padding-right: 5px;">
+                ACM
             </label>
-            <label>
-                <input id="result" type="radio" name="refTypeCheckbox" value="acm" onclick="openForm()">ACM</label>
         </div>
     </div>
 </div>

diff --git a/src/templates/reference_list.html b/src/templates/reference_list.html
@@ -13,78 +13,66 @@ <h2>References</h2>
 
 {% if references %}
 <div>
-  <a class="btn btn-primary btn-sm py-0 px-1 ms-2" href="/export_bibtex" role="button" download="references.bib" style="margin-top: 20px;">Download references as BibTeX -file</a>
+  <a type="button" class="btn btn-primary" href="/export_bibtex" role="button" download="references.bib" style="margin-top: 20px;">Download references as BibTeX -file</a>
 </div>
 
 {% if not view_as_bibtex %}
 <div>
-  <form action="/change_list_format" method="post" style="padding-bottom: 20px;">
+  <form action="/change_list_format" method="post" style="padding-bottom: 20px; padding-top: 20px;">
     <input type="submit" id="view_bibtex_format" value="View in BibTex format" />
   </form>
 
   <ul class="list-group">
     {% for reference in references %}
-      <li class="list-group-item">
-        <div>
+      <li class="list-group-item" style="display: flex; justify-content: space-between; align-items: center;">
+        <div style="display: inline-block">
           <!-- author:-->
             {{ reference[3] }}.
-
           {% if reference[10] %}
-
           <!--month and year-->
           ({{reference[10]}} {{reference[6]}}),
-
           <!--just year-->
           {% else %}
           ({{reference[6]}}), 
-
           {% endif %}
-
           <!--title-->
           '{{reference[4]}}'
-
           <!--journal-->
           {% if reference[5] %}, <i>{{ reference[5] }}</i>{% endif %}
-
           <!--volume-->
           {% if reference[7] %}, volume {{ reference[7] }}{% endif %}
-
           <!--number-->
           {% if reference[8] %}, number {{ reference[8] }}{% endif %} 
-
           <!--pages-->
           {% if reference[9] %}, p. {{ reference[9] }}{% endif %} 
-
           <!--note-->
           {% if reference[11] %}, note: {{ reference[11] }}{% endif %}
-
           <!--howpublished-->
           {% if reference[12] %}, {{ reference[12] }}{% endif %}
-
           <!--editor-->
           {% if reference[13] %}, {{ reference[13] }}{% endif %}
-
           <!--publisher-->
           {% if reference[14] %}, {{ reference[14] }}{% endif %}
-
+        </div>
+        <div style="float: right; padding-left: 20px;" >
           {% if reference in selected_references %}
           <script>console.log("{{ reference }}")</script>
           <script>console.log("{{ selected_references[0] }}")</script>
-          <form action="/deselect_reference/{{ reference[0] }}" method="post" style="float: right; margin-right: 10px; margin-left: 10px;">
+          <form action="/deselect_reference/{{ reference[0] }}" method="post" style="padding-bottom: 5px;">
             <button type="submit" class="btn btn-danger">Deselect</button>
           </form>
           {% else %}
-          <form action="/select_reference/{{ reference[0] }}" method="post" style="float: right; margin-right: 10px; margin-left: 10px;">
+          <form action="/select_reference/{{ reference[0] }}" method="post" style="padding-bottom: 5px;">
             <button type="submit" class="btn btn-primary">Select</button>
           </form>
           <script>console.log("{{ reference }}", "selected")</script>
           <script>console.log("{{ selected_references[0] }}", "selected")</script>
           {% endif %}
 
-          <a type="button" class="btn btn-primary" href="/edit_reference/{{ reference[0] }}" name="edit_reference" style="float: right;">
-            Edit
-          </a>
-          <form action="/delete_reference/{{ reference[0] }}" method="post" style="float: right; margin-right: 10px;">
+          <form action="/edit_reference/{{ reference[0] }}" type="button" name="edit_reference" style="padding-bottom: 5px;">
+            <button type="submit" class="btn btn-primary">Edit</button>
+          </form>
+          <form action="/delete_reference/{{ reference[0] }}" method="post">
             <button type="submit" class="btn btn-danger">Delete</button>
           </form>
         </div>
@@ -93,7 +81,7 @@ <h2>References</h2>
   </ul>
 </div>
 {% else %}
-<form action="/change_list_format" method="post">
+<form action="/change_list_format" method="post" style="padding-bottom: 20px; padding-top: 20px;">
   <input type="submit" id="view_normal_format" value="View in normal format" />
 </form>
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,6 @@ @@
             </div>
           </nav>
         </div>
-        <hr>
         {% block body %}
         {% endblock %}
@@ Expand Down @@