diff options
author | Andreas Berenz | 2016-10-06 09:58:03 +0200 |
---|---|---|
committer | Andreas Berenz | 2016-10-06 09:58:03 +0200 |
commit | 8d24c603ba5be15a39f819d289a6da9830a221c7 (patch) | |
tree | fe66335409c41d375bf2089372d86d58558bebc6 | |
parent | Merge branch 'modularization' of git.openslx.org:openslx-ng/slx-admin into mo... (diff) | |
download | slx-admin-8d24c603ba5be15a39f819d289a6da9830a221c7.tar.gz slx-admin-8d24c603ba5be15a39f819d289a6da9830a221c7.tar.xz slx-admin-8d24c603ba5be15a39f819d289a6da9830a221c7.zip |
removed obsolete 'obstacle' attribute
-rw-r--r-- | modules-available/roomplanner/js/grid.js | 21 | ||||
-rw-r--r-- | modules-available/roomplanner/templates/page.html | 102 |
2 files changed, 53 insertions, 70 deletions
diff --git a/modules-available/roomplanner/js/grid.js b/modules-available/roomplanner/js/grid.js index a2e56103..09e52099 100644 --- a/modules-available/roomplanner/js/grid.js +++ b/modules-available/roomplanner/js/grid.js @@ -117,9 +117,6 @@ if (!roomplanner) var roomplanner = { "helper" : false, "grid" : [(roomplanner.settings.scale / 4), (roomplanner.settings.scale / 4)], "stop": function(ev,ui) { - if ($(this).attr("obstacle") == "true") { - $(this).addClass("obstacle"); - } if ($(this).attr('itemtype').indexOf('_drag') > -1) { var itemtype = $(this).attr('itemtype').replace('_drag',''); @@ -138,7 +135,6 @@ if (!roomplanner) var roomplanner = { var itemtype = $(this).attr('itemtype'); $(this).attr('itemtype',itemtype+'_drag'); - $(this).removeClass("obstacle"); } }; @@ -206,7 +202,6 @@ if (!roomplanner) var roomplanner = { } }, start: function(ev,ui) { - $(this).removeClass("obstacle"); var itemtype = $(this).attr('itemtype'); $(this).attr('itemtype',itemtype+'_drag'); @@ -239,10 +234,7 @@ if (!roomplanner) var roomplanner = { }, stop: function(ev,ui) { - if ($(this).attr("obstacle") == "true") { - $(this).addClass("obstacle"); - } - + if ($(this).attr('itemtype').indexOf('_drag') > -1) { var itemtype = $(this).attr('itemtype').replace('_drag',''); $(this).attr('itemtype',itemtype); @@ -339,11 +331,6 @@ if (!roomplanner) var roomplanner = { html += prop+'="'+item[prop]+'" '; } html += 'class="draggable ui-draggable'; - - if (obstacle) { - html += " obstacle"; - } - html+= '"></div>'; return html; } @@ -557,10 +544,7 @@ $(document).ready(function(){ var gridPositions = roomplanner.getGridFromPixels(parseInt($(el).css('left')),parseInt($(el).css('top'))); $(el).attr('gridRow',gridPositions[0]); $(el).attr('gridCol',gridPositions[1]); - - if ($(el).attr("obstacle") == "true") { - $(el).addClass("obstacle"); - } + roomplanner.initResizable(el); roomplanner.initDraggable(el); @@ -604,7 +588,6 @@ $(document).ready(function(){ //grid : [(roomplanner.settings.scale / 4), (roomplanner.settings.scale / 4)], preventCollision: true, restraint: "#draw-element-area", - obstacle: ".obstacle", cursorAt: {left:5,top:5}, start: function(ev,ui) { $(ui.helper).css('opacity',0.8); diff --git a/modules-available/roomplanner/templates/page.html b/modules-available/roomplanner/templates/page.html index 52916aa9..ba51b893 100644 --- a/modules-available/roomplanner/templates/page.html +++ b/modules-available/roomplanner/templates/page.html @@ -74,42 +74,42 @@ <div role="tabpanel" class="tab-pane" id="walls"> <ul class="toollist"> <li> - <div itemtype="furniture" scalable="h" itemlook="wall-horizontal" class="draggable" obstacle=true style="width:100px; height:25px;" data-height="25" data-width="100" title="Wand (horizontal)"></div> + <div itemtype="furniture" scalable="h" itemlook="wall-horizontal" class="draggable" style="width:100px; height:25px;" data-height="25" data-width="100" title="Wand (horizontal)"></div> </li> <li> - <div itemtype="furniture" scalable="v" itemlook="wall-vertical" class="draggable" obstacle=true style="width:25px; height:100px;" data-height="100" data-width="25" title="Wand (vertial)"></div> + <div itemtype="furniture" scalable="v" itemlook="wall-vertical" class="draggable" style="width:25px; height:100px;" data-height="100" data-width="25" title="Wand (vertial)"></div> </li> <li> - <div itemtype="furniture" scalable="h" itemlook="window-horizontal" class="draggable" obstacle=true style="width:50px; height:25px;" data-height="25" data-width="50" title="Fenster"></div> + <div itemtype="furniture" scalable="h" itemlook="window-horizontal" class="draggable" style="width:50px; height:25px;" data-height="25" data-width="50" title="Fenster"></div> </li> <li> - <div itemtype="furniture" scalable="v" itemlook="window-vertical" class="draggable" obstacle=true style="width:25px; height:50px;" data-height="50" data-width="25" title="Fenster"></div> + <div itemtype="furniture" scalable="v" itemlook="window-vertical" class="draggable" style="width:25px; height:50px;" data-height="50" data-width="25" title="Fenster"></div> </li> <li> - <div itemtype="furniture" itemlook="door-nw" class="draggable" obstacle=true style="width:50px; height:100px;" data-height="100" data-width="50" title="{{lang_door}}"></div> + <div itemtype="furniture" itemlook="door-nw" class="draggable" style="width:50px; height:100px;" data-height="100" data-width="50" title="{{lang_door}}"></div> </li> <li> - <div itemtype="furniture" itemlook="door-ne" class="draggable" obstacle=true style="width:50px; height:100px;" data-height="100" data-width="50" title="{{lang_door}}"></div> + <div itemtype="furniture" itemlook="door-ne" class="draggable" style="width:50px; height:100px;" data-height="100" data-width="50" title="{{lang_door}}"></div> </li> <li> - <div itemtype="furniture" itemlook="door-sw" class="draggable" obstacle=true style="width:50px; height:100px;" data-height="100" data-width="50" title="{{lang_door}}"></div> + <div itemtype="furniture" itemlook="door-sw" class="draggable" style="width:50px; height:100px;" data-height="100" data-width="50" title="{{lang_door}}"></div> </li> <li> - <div itemtype="furniture" itemlook="door-se" class="draggable" obstacle=true style="width:50px; height:100px;" data-height="100" data-width="50" title="{{lang_door}}"></div> + <div itemtype="furniture" itemlook="door-se" class="draggable" style="width:50px; height:100px;" data-height="100" data-width="50" title="{{lang_door}}"></div> </li> <li> - <div itemtype="furniture" itemlook="door-wn" class="draggable" obstacle=true style="width:100px; height:50px;" data-height="50" data-width="100" title="{{lang_door}}"></div> + <div itemtype="furniture" itemlook="door-wn" class="draggable" style="width:100px; height:50px;" data-height="50" data-width="100" title="{{lang_door}}"></div> </li> <li> - <div itemtype="furniture" itemlook="door-ws" class="draggable" obstacle=true style="width:100px; height:50px;" data-height="50" data-width="100" title="{{lang_door}}"></div> + <div itemtype="furniture" itemlook="door-ws" class="draggable" style="width:100px; height:50px;" data-height="50" data-width="100" title="{{lang_door}}"></div> </li> <li> - <div itemtype="furniture" itemlook="door-en" class="draggable" obstacle=true style="width:100px; height:50px;" data-height="50" data-width="100" title="{{lang_door}}"></div> + <div itemtype="furniture" itemlook="door-en" class="draggable" style="width:100px; height:50px;" data-height="50" data-width="100" title="{{lang_door}}"></div> </li> <li> - <div itemtype="furniture" itemlook="door-es" class="draggable" obstacle=true style="width:100px; height:50px;" data-height="50" data-width="100" title="{{lang_door}}"></div> + <div itemtype="furniture" itemlook="door-es" class="draggable" style="width:100px; height:50px;" data-height="50" data-width="100" title="{{lang_door}}"></div> </li> </ul> @@ -119,16 +119,16 @@ <div role="tabpanel" class="tab-pane active" id="computers"> <ul class="toollist"> <li> - <div itemtype="pc" itemlook="pc-south" class="draggable" obstacle=true style="width:100px; height:100px;" data-height="100" data-width="100" title="PC" noresize=1></div> + <div itemtype="pc" itemlook="pc-south" class="draggable" style="width:100px; height:100px;" data-height="100" data-width="100" title="PC" noresize=1></div> </li> <li> - <div itemtype="pc" itemlook="copier" class="draggable" obstacle=true style="width:100px; height:100px;" data-height="100" data-width="100" title="{{lang_photocopier}}" noresize=1></div> + <div itemtype="pc" itemlook="copier" class="draggable" style="width:100px; height:100px;" data-height="100" data-width="100" title="{{lang_photocopier}}" noresize=1></div> </li> <li> - <div itemtype="pc" itemlook="printer" class="draggable" obstacle=true style="width:100px; height:100px;" data-height="100" data-width="100" title="{{lang_printer}}" noresize=1></div> + <div itemtype="pc" itemlook="printer" class="draggable" style="width:100px; height:100px;" data-height="100" data-width="100" title="{{lang_printer}}" noresize=1></div> </li> <li> - <div itemtype="pc" itemlook="telephone" class="draggable" obstacle=true style="width:100px; height:100px;" data-height="100" data-width="100" title="{{lang_telephone}}" noresize=1></div> + <div itemtype="pc" itemlook="telephone" class="draggable" style="width:100px; height:100px;" data-height="100" data-width="100" title="{{lang_telephone}}" noresize=1></div> </li> </ul> </div> @@ -136,13 +136,13 @@ <div role="tabpanel" class="tab-pane" id="electricaldevices"> <ul class="toollist"> <li> - <div itemtype="furniture" itemlook="flatscreen" class="draggable" obstacle=true style="width:75px; height:100px;" data-height="100" data-width="75" title="{{lang_flatscreen}}"></div> + <div itemtype="furniture" itemlook="flatscreen" class="draggable" style="width:75px; height:100px;" data-height="100" data-width="75" title="{{lang_flatscreen}}"></div> </li> <li> - <div itemtype="furniture" itemlook="lamp" class="draggable" obstacle=true style="width:125px; height:50px;" data-height="50" data-width="125" title="{{lang_deskLamp}}"></div> + <div itemtype="furniture" itemlook="lamp" class="draggable" style="width:125px; height:50px;" data-height="50" data-width="125" title="{{lang_deskLamp}}"></div> </li> <li> - <div itemtype="furniture" itemlook="tvcamera" class="draggable" obstacle=true style="width:125px; height:50px;" data-height="50" data-width="125" title="{{lang_projector}}"></div> + <div itemtype="furniture" itemlook="tvcamera" class="draggable" style="width:125px; height:50px;" data-height="50" data-width="125" title="{{lang_projector}}"></div> </li> </ul> </div> @@ -150,50 +150,50 @@ <div role="tabpanel" class="tab-pane" id="tables"> <ul class="toollist"> <li> - <div itemtype="furniture" itemlook="4chairs1squaretable" class="draggable" obstacle=true style="width:100px; height:100px;" data-height="100" data-width="100" title="{{lang_4chairs1squaretable}}"></div> + <div itemtype="furniture" itemlook="4chairs1squaretable" class="draggable" style="width:100px; height:100px;" data-height="100" data-width="100" title="{{lang_4chairs1squaretable}}"></div> </li> <li> - <div itemtype="furniture" itemlook="6chairs1table-horizontal" class="draggable" obstacle=true style="width:100px; height:75px;" data-height="75" data-width="100" title="{{lang_6chairs1table}}"></div> + <div itemtype="furniture" itemlook="6chairs1table-horizontal" class="draggable" style="width:100px; height:75px;" data-height="75" data-width="100" title="{{lang_6chairs1table}}"></div> </li> <li> - <div itemtype="furniture" itemlook="8chairs1conferencetable-horizontal" class="draggable" obstacle=true style="width:175px; height:100px;" data-height="100" data-width="175" title="{{lang_8chairs1conferencetable}}"></div> + <div itemtype="furniture" itemlook="8chairs1conferencetable-horizontal" class="draggable" style="width:175px; height:100px;" data-height="100" data-width="175" title="{{lang_8chairs1conferencetable}}"></div> </li> <li> - <div itemtype="furniture" itemlook="classroomdesk-north" class="draggable" obstacle=true style="width:275px; height:100px;" data-height="100" data-width="275" title="{{lang_classroomdesk}}"></div> + <div itemtype="furniture" itemlook="classroomdesk-north" class="draggable" style="width:275px; height:100px;" data-height="100" data-width="275" title="{{lang_classroomdesk}}"></div> </li> <li> - <div itemtype="furniture" itemlook="classroomdeskchair-north" class="draggable" obstacle=true style="width:175px; height:100px;" data-height="100" data-width="175" title="{{lang_classroomdeskchair}}"></div> + <div itemtype="furniture" itemlook="classroomdeskchair-north" class="draggable" style="width:175px; height:100px;" data-height="100" data-width="175" title="{{lang_classroomdeskchair}}"></div> </li> <li> - <div itemtype="furniture" itemlook="classroomtable-east" class="draggable" obstacle=true style="width:75px; height:100px;" data-height="100" data-width="75" title="{{lang_classroomtable}}"></div> + <div itemtype="furniture" itemlook="classroomtable-east" class="draggable" style="width:75px; height:100px;" data-height="100" data-width="75" title="{{lang_classroomtable}}"></div> </li> <li> - <div itemtype="furniture" itemlook="classroomtablechair-north" class="draggable" obstacle=true style="width:75px; height:100px;" data-height="100" data-width="75" title="{{lang_classroomdeskchair}}"></div> + <div itemtype="furniture" itemlook="classroomtablechair-north" class="draggable" style="width:75px; height:100px;" data-height="100" data-width="75" title="{{lang_classroomdeskchair}}"></div> </li> <li> - <div itemtype="furniture" itemlook="conferencetable-horizontal" class="draggable" obstacle=true style="width:200px; height:100px;" data-height="100" data-width="200" title="{{lang_conferencetable}}"></div> + <div itemtype="furniture" itemlook="conferencetable-horizontal" class="draggable" style="width:200px; height:100px;" data-height="100" data-width="200" title="{{lang_conferencetable}}"></div> </li> <li> - <div itemtype="furniture" itemlook="podium-north" class="draggable" obstacle=true style="width:200px; height:100px;" data-height="100" data-width="200" title="{{lang_podium}}"></div> + <div itemtype="furniture" itemlook="podium-north" class="draggable" style="width:200px; height:100px;" data-height="100" data-width="200" title="{{lang_podium}}"></div> </li> <li> - <div itemtype="furniture" itemlook="roundeddesk-east" class="draggable" obstacle=true style="width:75px; height:100px;" data-height="100" data-width="75" title="{{lang_roundeddesk}}"></div> + <div itemtype="furniture" itemlook="roundeddesk-east" class="draggable" style="width:75px; height:100px;" data-height="100" data-width="75" title="{{lang_roundeddesk}}"></div> </li> <li> - <div itemtype="furniture" itemlook="roundtable" class="draggable" obstacle=true style="width:100px; height:100px;" data-height="100" data-width="100" title="{{lang_roundtable}}"></div> + <div itemtype="furniture" itemlook="roundtable" class="draggable" style="width:100px; height:100px;" data-height="100" data-width="100" title="{{lang_roundtable}}"></div> </li> <li> - <div itemtype="furniture" itemlook="semicirculartable-north" class="draggable" obstacle=true style="width:200px; height:100px;" data-height="100" data-width="200" title="{{lang_semicirculartable}}"></div> + <div itemtype="furniture" itemlook="semicirculartable-north" class="draggable" style="width:200px; height:100px;" data-height="100" data-width="200" title="{{lang_semicirculartable}}"></div> </li> <li> - <div itemtype="furniture" itemlook="squaretable" class="draggable" obstacle=true style="width:100px; height:100px;" data-height="100" data-width="100" title="{{lang_squaretable}}"></div> + <div itemtype="furniture" itemlook="squaretable" class="draggable" style="width:100px; height:100px;" data-height="100" data-width="100" title="{{lang_squaretable}}"></div> </li> <li> - <div itemtype="furniture" itemlook="studentdesk-north" class="draggable" obstacle=true style="width:150px; height:100px;" data-height="100" data-width="150" title="{{lang_studentdesk}}"></div> + <div itemtype="furniture" itemlook="studentdesk-north" class="draggable" style="width:150px; height:100px;" data-height="100" data-width="150" title="{{lang_studentdesk}}"></div> </li> @@ -204,25 +204,25 @@ <div role="tabpanel" class="tab-pane" id="chairs"> <ul class="toollist"> <li> - <div itemtype="furniture" itemlook="armchair-south" class="draggable" obstacle=true style="width:100px; height:100px;" data-height="100" data-width="100" title="{{lang_armchair}}"></div> + <div itemtype="furniture" itemlook="armchair-south" class="draggable" style="width:100px; height:100px;" data-height="100" data-width="100" title="{{lang_armchair}}"></div> </li> <li> - <div itemtype="furniture" itemlook="chair-south" class="draggable" obstacle=true style="width:125px; height:100px;" data-height="100" data-width="125" title="{{lang_chair}}"></div> + <div itemtype="furniture" itemlook="chair-south" class="draggable" style="width:125px; height:100px;" data-height="100" data-width="125" title="{{lang_chair}}"></div> </li> <li> - <div itemtype="furniture" itemlook="chair2-south" class="draggable" obstacle=true style="width:100px; height:100px;" data-height="100" data-width="100" title="{{lang_chair}}"></div> + <div itemtype="furniture" itemlook="chair2-south" class="draggable" style="width:100px; height:100px;" data-height="100" data-width="100" title="{{lang_chair}}"></div> </li> <li> - <div itemtype="furniture" itemlook="couch-south" class="draggable" obstacle=true style="width:100px; height:100px;" data-height="100" data-width="100" title="{{lang_couch}}"></div> + <div itemtype="furniture" itemlook="couch-south" class="draggable" style="width:100px; height:100px;" data-height="100" data-width="100" title="{{lang_couch}}"></div> </li> <li> - <div itemtype="furniture" itemlook="greenchair-south" class="draggable" obstacle=true style="width:125px; height:100px;" data-height="100" data-width="125" title="{{lang_greenchair}}"></div> + <div itemtype="furniture" itemlook="greenchair-south" class="draggable" style="width:125px; height:100px;" data-height="100" data-width="125" title="{{lang_greenchair}}"></div> </li> <li> - <div itemtype="furniture" itemlook="studentdeskchair-north" class="draggable" obstacle=true style="width:100px; height:100px;" data-height="100" data-width="100" title="{{lang_studentdeskchair}}"></div> + <div itemtype="furniture" itemlook="studentdeskchair-north" class="draggable" style="width:100px; height:100px;" data-height="100" data-width="100" title="{{lang_studentdeskchair}}"></div> </li> </ul> </div> @@ -230,25 +230,25 @@ <div role="tabpanel" class="tab-pane" id="furniture"> <ul class="toollist"> <li> - <div itemtype="furniture" itemlook="locker-east" class="draggable" obstacle=true style="width:100px; height:75px;" data-height="75" data-width="100" title="{{lang_locker}}"></div> + <div itemtype="furniture" itemlook="locker-east" class="draggable" style="width:100px; height:75px;" data-height="75" data-width="100" title="{{lang_locker}}"></div> </li> <li> - <div itemtype="furniture" itemlook="locker-north" class="draggable" obstacle=true style="width:75px; height:100px;" data-height="100" data-width="75" title="{{lang_locker}}"></div> + <div itemtype="furniture" itemlook="locker-north" class="draggable" style="width:75px; height:100px;" data-height="100" data-width="75" title="{{lang_locker}}"></div> </li> <li> - <div itemtype="furniture" itemlook="coatrack-east" class="draggable" obstacle=true style="width:25px; height:150px;" data-height="150" data-width="25" title="{{lang_coatrack}}"></div> + <div itemtype="furniture" itemlook="coatrack-east" class="draggable" style="width:25px; height:150px;" data-height="150" data-width="25" title="{{lang_coatrack}}"></div> </li> <li> - <div itemtype="furniture" itemlook="coatrack-north" class="draggable" obstacle=true style="width:150px; height:25px;" data-height="25" data-width="150" title="{{lang_coatrack}}"></div> + <div itemtype="furniture" itemlook="coatrack-north" class="draggable" style="width:150px; height:25px;" data-height="25" data-width="150" title="{{lang_coatrack}}"></div> </li> <li> - <div itemtype="furniture" itemlook="lecturetheaterrow" class="draggable" obstacle=true style="width:725px; height:100px;" data-height="100" data-width="725" title="{{lang_lecturetheaterrow}}"></div> + <div itemtype="furniture" itemlook="lecturetheaterrow" class="draggable" style="width:725px; height:100px;" data-height="100" data-width="725" title="{{lang_lecturetheaterrow}}"></div> </li> <li> - <div itemtype="furniture" itemlook="lecturetheaterrowseats" class="draggable" obstacle=true style="width:725px; height:50px;" data-height="50" data-width="725" title="{{lang_lecturetheaterrow}}"></div> + <div itemtype="furniture" itemlook="lecturetheaterrowseats" class="draggable" style="width:725px; height:50px;" data-height="50" data-width="725" title="{{lang_lecturetheaterrow}}"></div> </li> </ul> @@ -257,10 +257,10 @@ <div role="tabpanel" class="tab-pane" id="officesupply"> <ul class="toollist"> <li> - <div itemtype="furniture" itemlook="papertray" class="draggable" obstacle=true style="width:25px; height:50px;" data-height="50" data-width="25" title="{{lang_papertray}}"></div> + <div itemtype="furniture" itemlook="papertray" class="draggable" style="width:25px; height:50px;" data-height="50" data-width="25" title="{{lang_papertray}}"></div> </li> <li> - <div itemtype="furniture" itemlook="wastecan" class="draggable" obstacle=true style="width:50px; height:50px;" data-height="50" data-width="50" title="{{lang_wastecan}}"></div> + <div itemtype="furniture" itemlook="wastecan" class="draggable" style="width:50px; height:50px;" data-height="50" data-width="50" title="{{lang_wastecan}}"></div> </li> </ul> @@ -268,20 +268,20 @@ <div role="tabpanel" class="tab-pane" id="plants"> <ul class="toollist"> <li> - <div itemtype="furniture" itemlook="plant" class="draggable" obstacle=true style="width:75px; height:75px;" data-height="75" data-width="75" title="{{lang_plant}}"></div> + <div itemtype="furniture" itemlook="plant" class="draggable" style="width:75px; height:75px;" data-height="75" data-width="75" title="{{lang_plant}}"></div> </li> <li> - <div itemtype="furniture" itemlook="plant2" class="draggable" obstacle=true style="width:75px; height:75px;" data-height="75" data-width="75" title="{{lang_plant}}"></div> + <div itemtype="furniture" itemlook="plant2" class="draggable" style="width:75px; height:75px;" data-height="75" data-width="75" title="{{lang_plant}}"></div> </li> <li> - <div itemtype="furniture" itemlook="plant3" class="draggable" obstacle=true style="width:75px; height:75px;" data-height="75" data-width="75" title="{{lang_plant}}"></div> + <div itemtype="furniture" itemlook="plant3" class="draggable" style="width:75px; height:75px;" data-height="75" data-width="75" title="{{lang_plant}}"></div> </li> </ul> </div> <div role="tabpanel" class="tab-pane" id="misc"> <ul class="toollist"> <li> - <div itemtype="furniture" itemlook="projectionscreen" class="draggable" obstacle=true style="width:525px; height:25px;" data-height="25" data-width="525" title="{{lang_plant}}"></div> + <div itemtype="furniture" itemlook="projectionscreen" class="draggable" style="width:525px; height:25px;" data-height="25" data-width="525" title="{{lang_plant}}"></div> </li> </ul> </div> |