From 6b5b366d1508c5eb2f38f99e3e8963bf3f34b7b4 Mon Sep 17 00:00:00 2001 From: Samantha Klasfeld Date: Sun, 29 Jan 2017 12:37:14 -0500 Subject: [PATCH 1/8] Update css to search bar When the user changes the experiment view screen to be smaller, the buttons at the top of the main table should not interfere with the table below it. These changes make it so they wrap around without interfering with the table. --- tmpl/User.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tmpl/User.tmpl b/tmpl/User.tmpl index fad130360..a647dcdb4 100644 --- a/tmpl/User.tmpl +++ b/tmpl/User.tmpl @@ -95,7 +95,7 @@ div.deleted { display: none; }
-
+
@@ -105,7 +105,7 @@ div.deleted { display: none; } - +
From 0e39b6f9e77af8e1f15b9c94961f957b634e380f Mon Sep 17 00:00:00 2001 From: Samantha Klasfeld Date: Sun, 29 Jan 2017 14:25:59 -0500 Subject: [PATCH 2/8] Update SearchResults.tmpl --- tmpl/SearchResults.tmpl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tmpl/SearchResults.tmpl b/tmpl/SearchResults.tmpl index c5feea632..5b68f3b07 100644 --- a/tmpl/SearchResults.tmpl +++ b/tmpl/SearchResults.tmpl @@ -26,7 +26,10 @@ const USER_ID = ''; From efe0f2e16b5095ef168df455ca3933daa06c473b Mon Sep 17 00:00:00 2001 From: Samantha Klasfeld Date: Sun, 29 Jan 2017 14:27:40 -0500 Subject: [PATCH 3/8] Update search-results.js Added info button to experiments view --- web/js/pages/search-results.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/js/pages/search-results.js b/web/js/pages/search-results.js index 2a22fe89c..f04c4cd6e 100644 --- a/web/js/pages/search-results.js +++ b/web/js/pages/search-results.js @@ -35,7 +35,7 @@ $(function () { title: 'Experiments', displayType: 'grid', dataTypes: ['experiment'], - operations: ['share', 'organize', 'favorite', 'delete', 'sendto'] + operations: ['share', 'organize', 'favorite', 'delete', 'sendto', 'info'] }, notebook: { title: 'Notebooks', From 5ecffbd2fabed6f483244b7c59ee170ecb419932 Mon Sep 17 00:00:00 2001 From: Samantha Klasfeld Date: Sun, 29 Jan 2017 14:42:33 -0500 Subject: [PATCH 4/8] Update user-common.js --- web/js/pages/user-common.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web/js/pages/user-common.js b/web/js/pages/user-common.js index 6d16b0869..7390f36d6 100644 --- a/web/js/pages/user-common.js +++ b/web/js/pages/user-common.js @@ -397,4 +397,9 @@ function toggle_star(img, id) { $(img).attr({ src: (val == 0 ? "picts/star-hollow.png" : "picts/star-full.png") }); } }); -} \ No newline at end of file +} + + +function open_close_info() { + $( "#info_panel" ).toggle(); +} From dad744802b0f3617467dfcf6abb157956f63f98d Mon Sep 17 00:00:00 2001 From: Samantha Klasfeld Date: Tue, 31 Jan 2017 18:40:19 -0500 Subject: [PATCH 5/8] Wrap toolbar to support smaller window size causes toolbar in MyData to wrap nicely when the browser is resized to a smaller scale. --- tmpl/User.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tmpl/User.tmpl b/tmpl/User.tmpl index a647dcdb4..b5dcc8174 100644 --- a/tmpl/User.tmpl +++ b/tmpl/User.tmpl @@ -95,7 +95,7 @@ div.deleted { display: none; }
-
+
@@ -105,7 +105,7 @@ div.deleted { display: none; } - +
From 11ac8917718187ba04eb2f025914eeed6867efbf Mon Sep 17 00:00:00 2001 From: Samantha Klasfeld Date: Tue, 31 Jan 2017 18:46:39 -0500 Subject: [PATCH 6/8] Allow bar to change height based on browser If window size is decreased than bar will wrap around therefore it must have an adjustable height --- tmpl/User.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmpl/User.tmpl b/tmpl/User.tmpl index b5dcc8174..e0384faf3 100644 --- a/tmpl/User.tmpl +++ b/tmpl/User.tmpl @@ -95,7 +95,7 @@ div.deleted { display: none; }
-
+
From 25aa50aa3ceb20c2c6994ed864086ffee766839e Mon Sep 17 00:00:00 2001 From: Samantha Klasfeld Date: Tue, 31 Jan 2017 19:09:42 -0500 Subject: [PATCH 7/8] Add icon for info button Info button is for Experiment and Notebook page to hide or show the info_panel --- web/picts/info_icon.png | Bin 0 -> 5316 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 web/picts/info_icon.png diff --git a/web/picts/info_icon.png b/web/picts/info_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4d114d949a0185fef8f318e22f78be125e676495 GIT binary patch literal 5316 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 Date: Tue, 31 Jan 2017 19:11:32 -0500 Subject: [PATCH 8/8] Create button to show/hide info-panel This should add an info button called "i-button" which is used to hide or show the info-panel for the experiment and notebook pages. --- tmpl/SearchResults.tmpl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tmpl/SearchResults.tmpl b/tmpl/SearchResults.tmpl index 5b68f3b07..d105b4ec4 100644 --- a/tmpl/SearchResults.tmpl +++ b/tmpl/SearchResults.tmpl @@ -29,9 +29,6 @@ const USER_ID = '';
- -
-
@@ -45,6 +42,7 @@ const USER_ID = '';
  • Experiments
  • Notebooks
  • User Groups
    • +
  • Info
    • @@ -65,7 +63,6 @@ const USER_ID = ''; -