Commit Graph
32 Commits
Author SHA1 Message Date
Martin Cech 1e3b3a1558 fix the value passed to Masthead as options were options.config before 2016-04-12 14:43:18 -04:00
Martin Cech 2ebe940510 load options from config, not from options 2016-04-12 12:50:18 -04:00
guerler 79d16f71f9 Fix scratchbook 2016-03-22 14:19:58 -04:00
carlfeberhard fef166545c Layout: Fix optional panel rendering and associated inline css 2016-03-22 11:52:13 -04:00
carlfeberhard 133f77413e Fix 'Resend verification' link in inactive user message box which would display as [Object object] 2016-03-22 11:24:14 -04:00
guerler 58346169df Fix dom duplication 2016-03-22 10:54:38 -04:00
Bjoern Gruening 45f523f922 fix show_welcome_with_login = True 2016-02-03 15:19:09 +01:00
guerler 4b5b970d78 Fix disabled css 2016-01-13 20:50:40 -05:00
guerler 37f8038d63 Undo user icon in masthead 2016-01-13 14:31:40 -05:00
Dannon Baker a1a549ea67 Re-add identifiers to masthead, new ones for scratchbook (thanks @guerler) 2016-01-05 14:04:22 -05:00
Dannon Baker 1d97e4271e Merge dev to include menu/onclick fix. 2016-01-05 11:00:10 -05:00
Dannon Baker 62b80dfcc5 Fix onclick broken in #1407 2016-01-05 10:04:03 -05:00
Dannon Baker 4ef3e21c95 Fix onclick handling broken w/ #1407 2016-01-05 09:44:06 -05:00
Dannon Baker da8b943f53 Merge. 2016-01-04 19:23:06 -05:00
guerler c9870cb89d Fix url formatting 2016-01-04 08:34:56 -05:00
guerler 4cd621dd37 Add test cases 2015-12-31 01:46:37 -05:00
guerler 339ad57f3f Cleanup Masthead and Scratchbook
Cleanup Masthead and Scratchbook
2015-12-30 16:31:59 -05:00
guerler 048561d282 Avoid duplicate upload entries, revise modals, add tests
Revise styles

Add more tests
2015-12-19 17:08:49 -05:00
Dannon Baker 0203a69d88 Tours. 2015-12-18 10:26:22 -05:00
Dannon Baker 04f5ed4552 Reimplement menu onclick functionality that appears to have been dropped (probably a bad merge?) in the webpack PR. 2015-12-17 19:35:17 -05:00
carlfeberhard b72035c9fc Webpack: fix/re-work the pub-sub connection between the quotameter and the history panel so that the meter updates properly when a new dataset is added 2015-12-03 16:01:18 -05:00
carlfeberhard 002bc6b40a (merge dev) 2015-12-02 12:00:51 -05:00
carlfeberhard dba7e6640f Webpack: correct handlebars template generation to return an AMD function - this normalizes import of templates between webpack and require, fix sweepster tools import and templates 2015-11-20 12:36:05 -05:00
carlfeberhard 9c5d4cfc0e (merge dev) 2015-11-20 10:29:23 -05:00
carlfeberhard d1d2f8388a Webpack: allow extending options from template call, add /login as app entry point for login app (still allowing user/login), add root/welcome and /login to allowed paths when require_login, fix None type error for redirect when visiting user/login directly, fix rendering of masthead, add query string to object util, correct job_id loading from index 2015-11-18 15:11:30 -05:00
carlfeberhard 7b93a53a4c Webpack: polyfill object.assign for phantomjs; remove galaxy.frame.masthead.css in favor of adding styles locally; change css load order to prevent 'ui-button' name collision between base and jquery-ui 2015-11-17 12:16:13 -05:00
carlfeberhard 2956b12e9b Webpack: correct tool menu template loading in requirejs/galaxy.panels.mako by using require.config.map; normalize galaxy_config.root and Galaxy.options.root to Galaxy.root across the templates and js 2015-11-13 18:05:26 -05:00
carlfeberhard 372c2e9e43 Webpack: move data.js into dataset/data.js; pack scripts 2015-11-12 14:52:11 -05:00
carlfeberhard 78e6253178 Webpack: move old school modal into layout/ 2015-11-12 10:59:25 -05:00
carlfeberhard dc0b960ea1 Webpack: lowercase DD-helper throughout project to reflect changes in 7717659 2015-11-12 10:08:12 -05:00
carlfeberhard b1266b45dc Webpack: move panel to Backbone, implement ToolPanel and HistoryPanel; simplify js-app.mako (by removing alternate layouts); clean up debugging info, make Galaxy less chatty before logging setup 2015-11-11 17:48:11 -05:00
carlfeberhard a639b0c996 Webpack: move galaxy.masthead and galaxy.menu to layout/masthead and layout/menu, panel to layout/panel, and rename galaxy.frame to layout/scratchbook 2015-11-09 17:06:14 -05:00