Attract: class name fixes

To work with Bootstrap 4

src/scripts/tutti/10_tasks.js

@@ -277,7 +277,7 @@ function attract_form_save(form_id, item_id, item_save_url, options)
             // jQuery sends the response data (if JSON), or an XHR object (if not JSON).
             if (console) console.log('Failed saving', options.type, xhr_or_response_data);
 
-            $button.removeClass('btn-default').addClass('btn-danger');
+            $button.removeClass('btn-outline-success').addClass('btn-danger');
 
             statusBarSet('error', 'Failed saving. ' + xhr_or_response_data.status, 'pi-warning');
 

src/styles/_dashboard.sass

@@ -88,8 +88,6 @@
 /* Dashboard specific styles */
 .dashboard
 	.d-stats
-		padding: 0 10px
-
 		.d-stats-card
 			+container-box
 			padding: 10px
@@ -97,8 +95,6 @@
 			.progress
 				margin-bottom: 10px
 				height: 4px
-			h4
-				margin-top: 0
 
 		.d-stats-card-legend
 			display: flex

src/templates/attract/assets/view_asset_embed.pug

@@ -46,7 +46,7 @@
 
 		.input-group
 
-			button#item-save.btn.btn-default.btn-block(type='submit')
+			button#item-save.btn.btn-outline-success.btn-block(type='submit')
 				i.pi-check
 				| Save Asset
 		| {% else %}

src/templates/attract/index.pug

@@ -5,10 +5,9 @@
 | {% block body %}
 #col_main
 	.dashboard
-		.d-stats
-			h4
-				i.pi-attract
-				|  Attract
+		.d-stats.pt-2.px-2
+			span.h4 Attract
+
 	| {% if current_user.is_authenticated %}
 	| {% from "attract/tasks/task_list_for_user.html" import task_list_for_user %}
 	| {{ task_list_for_user(tasks['_meta']['total'], tasks['_items']) }}
@@ -18,20 +17,20 @@
 
 #col_right
 	.dashboard
-		.d-stats
-			h4 Statistics
+		.d-stats.p-2
 
 			| {% for proj, summary in projs_with_summaries %}
-			.d-stats-card
-				h4
-					a(href="{{ url_for('attract.shots.perproject.index', project_url=proj.url) }}") {{ proj.name }}
+			.d-stats-card.mb-2
+				h6
+					a.text-muted(href="{{ url_for('attract.shots.perproject.index', project_url=proj.url) }}") {{ proj.name }}
 
-					span.pull-right
-						a(href="{{ url_for('attract.shots.perproject.index', project_url=proj.url) }}") Shots
+					span.float-right
+						a.text-muted(href="{{ url_for('attract.shots.perproject.index', project_url=proj.url) }}") Shots
 						|  | 
-						a(href="{{ url_for('attract.assets.perproject.index', project_url=proj.url) }}") Assets
+						a.text-muted(href="{{ url_for('attract.assets.perproject.index', project_url=proj.url) }}") Assets
 						|  | 
-						a(href="{{ url_for('attract.tasks.perproject.index', project_url=proj.url) }}") Tasks
+						a.text-muted(href="{{ url_for('attract.tasks.perproject.index', project_url=proj.url) }}") Tasks
+
 				.progress
 					| {% for status, percentage in summary.percentages() %}
 					.progress-bar.bg-status(
@@ -59,7 +58,7 @@
 				| {% for act in activities['_items'] %}
 				| {% if act.link %}
 				li
-					a(href="{{ act.link }}")
+					a.text-muted(href="{{ act.link }}")
 						img.actor-avatar(src="{{ act['actor_user']['email'] | gravatar }}")
 						span.date(title="{{ act._created }}") {{ act._created | pretty_date_time }}
 						span.actor {{ act['actor_user']['full_name'] }}

src/templates/attract/index_anon_left_column.pug

@@ -5,9 +5,14 @@
 	.welcome-title Welcome to Attract
 
 	.welcome-text
-		p Your Production Management Software
+		p
+			|	Your Production Management Software
 
-h3.d-title Projects using Attract
+			a.btn.btn-link.btn-block(href="https://attract.studio/")
+				| Learn more
+				i.pi-angle-right
+
+h4.p-3 Projects using Attract
 .d-projects
 	| {% for proj, summary in projs_with_summaries %}
 	.d-projects-item

src/templates/attract/layout.pug

@@ -26,11 +26,12 @@ html(lang="en")
 		#app-main
 			#col_sidebar
 				nav.sidebar(role='navigation')
+					a.navbar-brand(
+						href="{{ url_for('main.homepage') }}",
+						title="Blender Cloud")
+						span.app-logo
+							i.pi-blender-cloud
 					ul
-						li
-							a.navbar-item.cloud(href="{% if project %}{{url_for('projects.view', project_url=project.url)}}{% else %}{{ url_for('main.homepage') }}{% endif %}",
-								title='Blender Cloud')
-								i.pi-blender-cloud
 						li
 							a.navbar-item.attract(href="{{ url_for('attract.index') }}",
 								title='Attract')
@@ -75,13 +76,13 @@ html(lang="en")
 				h1 Right
 			| {% endblock %}
 
-		.modal.fade#modal(role="dialog")
-			.modal-dialog
+		.modal#modal(role="dialog", tabindex="-1")
+			.modal-dialog(role="document")
 				.modal-content
 					.modal-header
+						span.modal-title.title
 						button.close(type="button", data-dismiss="modal", aria-label="Close")
 							i.pi-cancel
-						span.title
 					.modal-body
 
 		script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.select2.min.js') }}", async=true)

src/templates/attract/shots/view_shot_embed.pug

@@ -38,7 +38,7 @@
 
 		.input-group
 
-			button#item-save.btn.btn-default.btn-block(type='submit')
+			button#item-save.btn.btn-outline-success.btn-block(type='submit')
 				i.pi-check
 				| Save Shot
 		| {% else %}

src/templates/attract/tasks/view_task_embed.pug

@@ -15,7 +15,7 @@
 			| {% endif %}
 
 			.dropdown(style='margin-left: auto')
-				button#item-dropdown.btn.btn-default.dropdown-toggle(
+				button#item-dropdown.btn.btn-outline-success.dropdown-toggle(
 					type='button',
 					data-toggle='dropdown',
 					aria-haspopup='true', aria-expanded='true')
@@ -96,7 +96,7 @@
 		.input-group-separator
 
 		.input-group
-			button#item-save.btn.btn-default.btn-block(type='submit')
+			button#item-save.btn.btn-outline-success.btn-block(type='submit')
 				i.pi-check
 				| Save Task
 		| {% else %}