UI improvements

evereux · evereux · commit 024dc0eb4a35 · 2024-07-04T12:48:55.000+01:00
diff --git a/application/pycatia_scripts/drafting/drawing_template_support/logo/pycatia-logo.jpg b/application/pycatia_scripts/drafting/drawing_template_support/logo/pycatia-logo.jpg
diff --git a/application/pycatia_scripts/drafting/drawing_template_support/title_block.py b/application/pycatia_scripts/drafting/drawing_template_support/title_block.py
@@ -325,7 +325,7 @@ def create_title_block(sheet: DrawingSheet,
         add_title_block_text(texts, text, text_x, text_y, size=2.2)
 
     # add the logo
-    logo = Path(path_prefix, 'application/pycatia_scripts/drafting/drawing_template_support/logo', drawing_template['logo'])
+    logo = Path(path_prefix, 'application/static/images', drawing_template['logo'])
     if not logo.is_file():
         raise CATIAApplicationException(f'Could not locate logo: "{logo}".')
     logo_x = v3["x"] + 12.5
diff --git a/application/pycatia_scripts/settings.py b/application/pycatia_scripts/settings.py
@@ -18,8 +18,7 @@ def read_yaml(f: Path):
     return data
 
 
-# you probably wouldn't have to do this out of a development environment.
-path_prefix = Path(os.getcwd())
+path_prefix = Path(os.path.dirname(__file__)).parent.parent
 
 yaml_file = Path(path_prefix, 'settings.yaml')
 yaml_data = read_yaml(yaml_file)
diff --git a/application/templates/common/header.html b/application/templates/common/header.html
@@ -1,6 +1,6 @@
 <!-- header.html -->
 <div id="get_document" hx-get="/htmx/document/object" hx-target="#document_object" hx-swap="innerHtml" hx-trigger="load">
-  <div id="document_object" style="height: 150px;">
+  <div id="document_object" style="height: 100px;">
   </div>
 </div>
 <h1 class="pytitle text-center">
diff --git a/application/templates/drafting_save_as_dxf.html b/application/templates/drafting_save_as_dxf.html
@@ -42,7 +42,7 @@ <h2 class="mt-3">Save As DXF</h2>
         </div>
     </div>
     <div class="text-center mt-2">
-        <button name="save_as" class="btn btn-primary rounded-1" value="save_as" script="on click remove #output">Save As</button>
+        <button name="save_as" class="btn btn-success rounded-1" value="save_as" script="on click remove #output">Save As</button>
     </div>
 </form>
 <div id="save_as">
diff --git a/application/templates/drafting_save_as_pdf.html b/application/templates/drafting_save_as_pdf.html
@@ -43,7 +43,7 @@ <h2 class="mt-3">Save As PDF</h2>
         </div>
     </div>
     <div class="text-center mt-2">
-        <button name="save_as" class="btn btn-primary rounded-1" value="save_as" script="on click remove #output">Save As</button>
+        <button name="save_as" class="btn btn-success rounded-1" value="save_as" script="on click remove #output">Save As</button>
     </div>
 </form>
 
diff --git a/application/templates/drafting_template.html b/application/templates/drafting_template.html
@@ -52,7 +52,7 @@ <h2 class="mt-3">Insert Drawing Template</h2>
             </div>
         </div>
         <div class="text-center">
-            <button name="template" class="btn btn-primary" value="template" script="on click remove #output">Insert Template</button>
+            <button name="template" class="btn btn-success" value="template" script="on click remove #output">Insert Template</button>
         </div>
     </form>
 
diff --git a/application/templates/drafting_views.html b/application/templates/drafting_views.html
@@ -20,8 +20,8 @@ <h2 class="mt-3">View Locks</h2>
 >
     <div class="col-12">
         <div class="input-group">
-            <button name="locker" class="btn btn-primary rounded-1 m-2" value="lock" script="on click remove #output">Lock Views</button>
-            <button name="locker" class="btn btn-primary rounded-1 m-2" value="unlock" script="on click remove #output">Unlock Views</button>
+            <button name="locker" class="btn btn-success rounded-1 m-2" value="lock" script="on click remove #output">Lock Views</button>
+            <button name="locker" class="btn btn-success rounded-1 m-2" value="unlock" script="on click remove #output">Unlock Views</button>
         </div>
         <div class="form-check">
             <input name="includeMainViewLock" value="True" class="form-check-input" type="checkbox" value="" id="includeMainViewLock">
@@ -55,8 +55,8 @@ <h2 class="mt-3">View Frames</h2>
 >
     <div class="col-12">
         <div class="input-group">
-            <button name="framer" class="btn btn-primary rounded-1 m-2" value="on" script="on click remove #output">Frame On</button>
-            <button name="framer" class="btn btn-primary rounded-1 m-2" value="off" script="on click remove #output">Frame Off</button>
+            <button name="framer" class="btn btn-success rounded-1 m-2" value="on" script="on click remove #output">Frame On</button>
+            <button name="framer" class="btn btn-success rounded-1 m-2" value="off" script="on click remove #output">Frame Off</button>
         </div>
     </div>
 </form>
diff --git a/application/templates/part_bounding_box.html b/application/templates/part_bounding_box.html
@@ -20,7 +20,7 @@ <h2>Create Bounding Box</h2>
         hx-indicator="#bounding_box"
 >
     <div class="text-center mt-2">
-        <button name="Create Bounding Box" class="btn btn-primary rounded-1" value="Create Bounding Box" script="on click remove #output">Create Bounding Box</button>
+        <button name="Create Bounding Box" class="btn btn-success rounded-1" value="Create Bounding Box" script="on click remove #output">Create Bounding Box</button>
     </div>
 </form>
 <div id="bounding_box">
diff --git a/application/templates/part_new.html b/application/templates/part_new.html
@@ -43,7 +43,7 @@ <h3>Attributes</h3>
         </div>
     </div>
     <div class="text-center mt-2">
-        <button name="Create Part" class="btn btn-primary rounded-1" value="Create Part" script="on click remove #output">Create Part</button>
+        <button name="Create Part" class="btn btn-success rounded-1" value="Create Part" script="on click remove #output">Create Part</button>
     </div>
 </form>
 <div class="mt-2" id="create_new">
diff --git a/application/templates/part_points.html b/application/templates/part_points.html
@@ -40,7 +40,7 @@ <h2>Export Points</h2>
         </div>
     </div>
     <div class="text-center mt-2">
-        <button name="Export Points" class="btn btn-primary rounded-1" value="Export Points" script="on click remove #output">Export Points</button>
+        <button name="Export Points" class="btn btn-success rounded-1" value="Export Points" script="on click remove #output">Export Points</button>
     </div>
 </form>
 <div class="mt-2" id="export_points">
@@ -83,7 +83,7 @@ <h2>Import Points</h2>
         </div>
     </div>
     <div class="text-center mt-2">
-        <button name="Import Points" class="btn btn-primary" value="Import Points">Import Points</button>
+        <button name="Import Points" class="btn btn-success" value="Import Points">Import Points</button>
     </div>
 </form>
 <div class="mt-2" id="import_points">
diff --git a/application/templates/partials/document_object.html b/application/templates/partials/document_object.html
@@ -1,40 +1,41 @@
 <!-- document_object.html -->
  {% set pd_1="2px" %}
-<h4 class="text-center bg-info">Active Document</h3>
- {% if not document_type %}
- <p id="document_object" class="alert alert-warning">
-    No document open.
-</p>
- {% endif %}
+<div class="row">
+    <div class="col text-end">
+        Active Document
+
+    </div>
+    <div class="col">
+        <button name="refresh" class="btn btn-success rounded-1 btn-sm" style="padding: 3px;" value="refresh" hx-get="/htmx/document/object" hx-target="#document_object" hx-swap="innerHtml">update</button>
+    </div>
+</div>
+
+{% if not document_type %}
+    <p id="document_object" class="alert alert-danger text-center">
+        No document open.
+    </p>
+{% endif %}
+
  {% if document_type == "document" %}
-<table id="document_object" class="table table-bordered table-sm mb-1">
-    <thead>
-        <tr class="table-light">
-            <th class="small text-muted" style="width: 1px; white-space: nowrap; padding: {{ pd_1 }};">Part Number</th>
-            <th class="small text-muted" style="padding: {{ pd_1 }};">Title</th>
-            <th class="small text-muted" style="width: 1px; white-space: nowrap; padding: {{ pd_1 }};">Revision</th>
-        </tr>
-    </thead>
-    <tbody>
-        <tr class="table-info">
-            <td class="small" style="padding: {{ pd_1 }};">{{ document_object.part_number }}</td>
-            <td class="small" style="padding: {{ pd_1 }};">{{ document_object.nomenclature }}</td>
-            <td class="small text-center" style="padding: 1px;">{{ document_object.revision }}</td>
-        </tr>
-    </tbody>
-    <tr>
-        <td class="table-info small"  style="padding: {{ pd_1 }};" colspan="3">{{ document_object.full_name }}</td>
-    </tr>
-</table>
+     <div class="row border-bottom">
+         <div class="col text-muted fw-bold small border-end">Part Number</div>
+         <div class="col text-muted fw-bold small border-end">Title</div>
+         <div class="col-1 text-muted fw-bold small">Revision</div>
+     </div>
+     <div class="row border-bottom">
+         <div class="col border-end">{{ document_object.part_number }}</div>
+         <div class="col border-end">{{ document_object.nomenclature }}</div>
+         <div class="col-1">{{ document_object.revision }}</div>
+     </div>
+     <div class="row">
+        <div class="col-1 border-end text-muted fw-bold small align-content-center">Path</div>
+        <div class="col">{{ document_object.full_name }}</div>
+     </div>
 
  {% elif document_type == 'drawing' %}
- <table class="table table-sm">
-    <tr>
-        <th class="small text-muted" style="padding: {{ pd_1 }};">Path</th>
-        <td class="small" style="padding: {{ pd_1 }};">{{ document_object.full_name }}</td>
-    </tr>
-</table>
+     <div class="row border">
+         <div class="col-1 border-end text-muted fw-bold small">Path</div>
+         <div class="col">{{ document_object.full_name }}</div>
+     </div>
+
 {% endif %}
-<div class="text-center">
-    <button name="refresh" class="btn btn-info rounded-1 btn-sm" style="padding: 3px;" value="refresh" hx-get="/htmx/document/object" hx-target="#document_object" hx-swap="innerHtml">update</button>
-</div>
diff --git a/application/templates/partials/menu.html b/application/templates/partials/menu.html
@@ -1,8 +1,8 @@
 <!-- menu.html -->
 <h1 class="text-center">{{ m_dict['title'] }}</h1>
 
-<p class="text-center">
+<p class="text-center bg-light border p-2">
 {%- for item in m_dict['menu_items'] -%}
-    <a class="btn btn-primary btn-sm m-1" href="{{ item['url'] }}">{{ item['title'] }}</a>
+    <a class="m-1 pb-2 pe-2" href="{{ item['url'] }}">{{ item['title'] }}</a>
 {%- endfor -%}
 </p>
diff --git a/application/templates/partials/menu_drafting_save_as.html b/application/templates/partials/menu_drafting_save_as.html
@@ -1,5 +1,5 @@
 <!-- menu_drafting_save_as.html -->
 <p class="text-center">
-    <a class="m-1" href="{{ url_for('drafting_save_as_pdf') }}">PDF</a>
-    <a class="m-1" href="{{ url_for('drafting_save_as_dxf') }}">DXF</a>
+    <a class="m-1 h3" href="{{ url_for('drafting_save_as_pdf') }}">PDF</a>
+    <a class="m-1 h3" href="{{ url_for('drafting_save_as_dxf') }}">DXF</a>
 </p>
diff --git a/application/templates/partials/product_attributes_div.html b/application/templates/partials/product_attributes_div.html
@@ -19,7 +19,7 @@
         <div class="col">{{ attributes['nomenclature'] }}</div>
     </div>
     <div class="text-center mt-2">
-        <button class="btn btn-primary" hx-get="/htmx/product/attributes/edit">
+        <button class="btn btn-success" hx-get="/htmx/product/attributes/edit">
             Click To Edit
         </button>
     </div>
diff --git a/application/templates/partials/product_attributes_form.html b/application/templates/partials/product_attributes_form.html
@@ -39,7 +39,7 @@
         </div>
     </div>
     <div class="text-center mt-2">
-        <button name="submit" class="btn btn-primary">
+        <button name="submit" class="btn btn-success">
             Click To Submit
         </button>
     </div>
diff --git a/application/templates/product_new.html b/application/templates/product_new.html
@@ -36,7 +36,7 @@ <h2 class="mt-3">Create New Product</h2>
         </div>
     </div>
     <div class="text-center mt-2">
-        <button name="Create Product" class="btn btn-primary rounded-1" value="Create Product" script="on click remove #output">Create Product</button>
+        <button name="Create Product" class="btn btn-success rounded-1" value="Create Product" script="on click remove #output">Create Product</button>
     </div>
 
 </form>
diff --git a/application/templates/product_reorder.html b/application/templates/product_reorder.html
@@ -20,7 +20,7 @@ <h2 class="mt-3">Reorder Tree</h2>
         hx-indicator="#reorder_tree"
 >
         <div class="text-center mt-2">
-            <button name="ReOrder Tree" class="btn btn-primary rounded-1" value="Reorder Tree" script="on click remove #output">Reorder Tree</button>
+            <button name="ReOrder Tree" class="btn btn-success rounded-1" value="Reorder Tree" script="on click remove #output">Reorder Tree</button>
         </div>
 </form>
 <div id="reorder_tree">
diff --git a/application/version.py b/application/version.py
@@ -1 +1 @@
-version="0.1dev2"
+version="0.1dev3"

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ <h2>Create Bounding Box</h2>`
`20`	`20`	`hx-indicator="#bounding_box"`
`21`	`21`	`>`
`22`	`22`	`<div class="text-center mt-2">`
`23`		`- <button name="Create Bounding Box" class="btn btn-primary rounded-1" value="Create Bounding Box" script="on click remove #output">Create Bounding Box</button>`
	`23`	`+ <button name="Create Bounding Box" class="btn btn-success rounded-1" value="Create Bounding Box" script="on click remove #output">Create Bounding Box</button>`
`24`	`24`	`</div>`
`25`	`25`	`</form>`
`26`	`26`	`<div id="bounding_box">`