Commit Graph

139 Commits

Author SHA1 Message Date
Adriaan Wormgoor 8311fdd9c1 vertical shapes sidebar now auto-resizes as well 2013-10-12 12:13:33 +02:00
Adriaan Wormgoor 613be4e619 fixed Firefox layouting issue of settings popup 2013-10-11 23:33:19 +02:00
Adriaan Wormgoor 632a0a0895 ..removed too much 2013-10-11 18:42:33 +02:00
Adriaan Wormgoor aea89d3422 - fixed canvasdrawing bug w.r.t. touch-enabled devices
- removed some superfluous lines
2013-10-11 18:40:03 +02:00
Adriaan Wormgoor 53e9a7e4a4 Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver
# By peteruithoven
# Via peteruithoven
* 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client:
  Readded print and stop button disabled css
  hasControl feedback
2013-10-11 18:00:17 +02:00
Adriaan Wormgoor fe53e31c27 removed unnecessary files, but moreover fixed a bug which was badly affecting the settings popup 2013-10-11 18:00:10 +02:00
peteruithoven 7126f1db79 Readded print and stop button disabled css 2013-10-11 16:18:41 +02:00
peteruithoven 253561210d hasControl feedback 2013-10-11 16:18:41 +02:00
Adriaan Wormgoor d61b9cb0d8 Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver
# By peteruithoven
# Via peteruithoven
* 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client:
  Fixing double printer.print call
  Starting print right away, remove some target temp display hacks
2013-10-11 15:44:22 +02:00
Adriaan Wormgoor c1ae40d952 removed unnecessary file 2013-10-11 15:44:13 +02:00
peteruithoven 8ff028dce1 Fixing double printer.print call 2013-10-11 15:34:18 +02:00
peteruithoven 1c930efdf5 Starting print right away, remove some target temp display hacks 2013-10-11 15:34:18 +02:00
Adriaan Wormgoor 8f5a2f7664 minor updates. 2013-10-11 15:08:50 +02:00
Adriaan Wormgoor 88c6845592 some js files were postfixed with version numbers (eg. v01, v02, etc), but this is bullshit from source control perspective, hence removed the postfixes 2013-10-11 15:06:32 +02:00
Adriaan Wormgoor 58b3a12c6b massive commit due to merging branch 'new_layouting_approach' into feature/printerdriver
----------------------------------------------------------------------

Merge branch 'new_layouting_approach' into feature/printerdriver

* new_layouting_approach: (22 commits)
  changed chmod
  adjustments to make preview be initialized and updated better (when resizing)
  updates css styles
  changes to how the draw and preview canvasses are positioned and initted
  many updates CSS and LESS files and generally a responsive scaling overhaul of the settings page
  new LESS
  simple js lib for managing the folded in/out state of the sidebars on the minimal interface
  arrow file used in the minimal doodle3d interface
  the resulting css files which LESS outputs
  removed this because it's being rolled into the styles.css by LESS
  moved logos to their own dir + removed a few redundant ones
  copy normalize.css to the LESS dir since it's a source file
  smallest size of the doodle3d logo
  started using LESS for stylesheeting
  commit of current state of this branch. It's a work-in-progress (comitting because I need to change to other branch)
  a lot of changes -> almost there but the drawing is not consistent yet across devices. Drawing on the draw canvas is going OK but the preview is not drawing well now. Giving up for now.
  changes (sry)
  intermediary progress
  commented out part of the css (not final solution)
  added todo for future
  ...
2013-10-11 15:02:26 +02:00
Adriaan Wormgoor 759616a8d4 changed chmod 2013-10-11 14:07:15 +02:00
Adriaan Wormgoor 080cc5670c adjustments to make preview be initialized and updated better (when resizing) 2013-10-11 13:42:12 +02:00
peteruithoven abc9841bc7 Handling new print3d driver (using new api, printer states) 2013-10-11 12:39:05 +02:00
Adriaan Wormgoor 65f43f197f updates css styles 2013-10-11 11:44:28 +02:00
Adriaan Wormgoor 0a44087989 changes to how the draw and preview canvasses are positioned and initted 2013-10-11 11:42:27 +02:00
Adriaan Wormgoor b6f77fc39e many updates CSS and LESS files and generally a responsive scaling overhaul of the settings page 2013-10-10 19:18:29 +02:00
peteruithoven d417a7454f Better network connecting feedback 2013-10-10 12:12:33 +02:00
Adriaan Wormgoor 98edfb2a7e new LESS 2013-10-09 19:21:33 +02:00
Adriaan Wormgoor 23fdaeaaa0 simple js lib for managing the folded in/out state of the sidebars on the minimal interface 2013-10-09 18:53:49 +02:00
Adriaan Wormgoor 16c46355f1 arrow file used in the minimal doodle3d interface 2013-10-09 18:53:16 +02:00
Adriaan Wormgoor a38535ecd1 the resulting css files which LESS outputs 2013-10-09 18:52:54 +02:00
Adriaan Wormgoor 1e646caef0 removed this because it's being rolled into the styles.css by LESS 2013-10-09 18:50:11 +02:00
Adriaan Wormgoor 58d8fa1454 moved logos to their own dir + removed a few redundant ones 2013-10-09 18:46:25 +02:00
Adriaan Wormgoor 1af5ee6125 copy normalize.css to the LESS dir since it's a source file 2013-10-09 18:21:49 +02:00
Adriaan Wormgoor c449ccd317 smallest size of the doodle3d logo 2013-10-09 18:18:34 +02:00
Adriaan Wormgoor 4d54dc56d9 started using LESS for stylesheeting 2013-10-09 18:15:47 +02:00
peteruithoven f292c01d64 Changed preheat temperature field into number 2013-10-02 14:49:37 +02:00
peteruithoven caca7b2ac9 Added wifiboxid to settings 2013-10-02 14:47:33 +02:00
peteruithoven 79e2fe1a8a Show current ip in settings window 2013-10-02 14:47:33 +02:00
peteruithoven b6dca873e7 Use uhttpd lua handler 2013-10-02 14:47:33 +02:00
Adriaan Wormgoor dd2ca8a1cb commit of current state of this branch. It's a work-in-progress (comitting because I need to change to other branch) 2013-09-27 18:15:33 +02:00
Wouter R a45d1ad8ed Bugfix for heatup change. 2013-09-27 16:04:56 +02:00
peteruithoven f0df41bc89 warmUpCommand > heatup.temperature 2013-09-27 13:58:59 +02:00
peteruithoven ce8e306994 Preventing OS X / iOS captive portal popup altogether 2013-09-25 19:01:08 +02:00
peteruithoven 80b4a53d5a Raw captive portal detected popup 2013-09-25 16:19:40 +02:00
Adriaan Wormgoor 1842ec01b2 Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client
# By peteruithoven
# Via peteruithoven
* 'master' of https://github.com/Doodle3D/doodle3d-client:
  Slightly longer allowed temp mod time
2013-09-18 22:35:59 +02:00
Adriaan Wormgoor 267587fe2f vertical shapes implemented 2013-09-18 22:35:38 +02:00
Adriaan Wormgoor ecae281a74 new vertical shape icons 2013-09-18 21:22:58 +02:00
peteruithoven 6c7018a00d Slightly longer allowed temp mod time 2013-09-18 20:59:35 +02:00
Adriaan Wormgoor 44f3895d34 small change to make settings page appear directly over the d3d interface 2013-09-18 20:43:00 +02:00
Adriaan Wormgoor 6cf58db7a3 reduced maximem rotation slightly, to reduce risk of overlapping 2013-09-18 20:42:32 +02:00
Adriaan Wormgoor fdfaafd99d simple code changes. Border around D3D interface makes slightly more sense. 2013-09-18 20:17:25 +02:00
Adriaan Wormgoor 3d318bb56e gcode changes submitted by Rick, w.r.t. centering the doodle for Ultimakers (means: doodle is only in positive space, i.e. there are no negative coordinates) 2013-09-18 20:15:58 +02:00
peteruithoven 979403826a another hack to show targetTemp 2013-09-18 19:20:44 +02:00
Adriaan Wormgoor 6e32a36e12 a lot of changes -> almost there but the drawing is not consistent yet across devices.
Drawing on the draw canvas is going OK but the preview is not drawing well now.
Giving up for now.
2013-09-18 19:08:58 +02:00