q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some cleanup from initial integration: removed separate icon for viewing gcode

master
Alex Ustyantsev 2013-02-02 19:53:46 +03:00
parent e49669430b
commit 4163d9436f
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
octoprint/static/css/ui.css
View File

@ -44,17 +44,17 @@ table th, table td {
table th.gcode_files_name, table td.gcode_files_name { table th.gcode_files_name, table td.gcode_files_name {
text-overflow: ellipsis; text-overflow: ellipsis;
text-align: left; text-align: left;
width: 50%; width: 55%;
} }
table th.gcode_files_size, table td.gcode_files_size { table th.gcode_files_size, table td.gcode_files_size {
text-align: right; text-align: right;
width: 20%; width: 25%;
} }
table th.gcode_files_action, table td.gcode_files_action { table th.gcode_files_action, table td.gcode_files_action {
text-align: center; text-align: center;
width: 30%; width: 20%;
} }
#temperature-graph { #temperature-graph {

11
octoprint/static/js/ui.js
View File

@ -669,6 +669,7 @@ function GcodeFilesViewModel() {
}) })
} }
<<<<<<< HEAD
self.viewFile = function() { self.viewFile = function() {
var filename = this.name; var filename = this.name;
$.ajax({ $.ajax({
@ -689,6 +690,10 @@ function GcodeFilesViewModel() {
} }
self.removeFile = function(filename) { self.removeFile = function(filename) {
=======
self.removeFile = function() {
var filename = this.name;
>>>>>>> Some cleanup from initial integration: removed separate icon for viewing gcode
$.ajax({ $.ajax({
url: AJAX_BASEURL + "gcodefiles/delete", url: AJAX_BASEURL + "gcodefiles/delete",
type: "POST", type: "POST",
@ -939,12 +944,8 @@ $(function() {
var terminalViewModel = new TerminalViewModel(); var terminalViewModel = new TerminalViewModel();
var gcodeFilesViewModel = new GcodeFilesViewModel(); var gcodeFilesViewModel = new GcodeFilesViewModel();
var webcamViewModel = new WebcamViewModel(); var webcamViewModel = new WebcamViewModel();
<<<<<<< HEAD
var dataUpdater = new DataUpdater(connectionViewModel, printerStateViewModel, temperatureViewModel, controlsViewModel, speedViewModel, terminalViewModel, webcamViewModel);
=======
var gcodeViewModel = new GcodeViewModel(); var gcodeViewModel = new GcodeViewModel();
var dataUpdater = new DataUpdater(connectionViewModel, printerStateViewModel, temperatureViewModel, speedViewModel, terminalViewModel, webcamViewModel, gcodeViewModel); var dataUpdater = new DataUpdater(connectionViewModel, printerStateViewModel, temperatureViewModel, controlsViewModel, speedViewModel, terminalViewModel, webcamViewModel, gcodeViewModel);
>>>>>>> Initial implementation of autoupdate gcodeview on status from server
//~~ Print job control //~~ Print job control