Merge remote branch 'upstream/master'

workflow/engine/templates/app/main.js

@@ -33,13 +33,15 @@ function openCaseNotesWindow(appUid1, delIndex, modalSw, appTitle, proUid, taskU
   var startRecord=0;
   var loadSize=10;
 
+  startRecord=startRecord+loadSize;
+
   storeNotes = new Ext.data.JsonStore({
     url: "../appProxy/getNotesList?appUid=" + appUid + "&delIndex=" + delIndex + "&pro=" + proUid + "&tas=" + taskUid,
     root: 'notes',
     totalProperty: 'totalCount',
     fields: ['USR_USERNAME','USR_FIRSTNAME','USR_LASTNAME','USR_FULL_NAME','NOTE_DATE','NOTE_CONTENT', 'USR_UID', 'user'],
     baseParams:{
-      start:startRecord,
+      start:0,
       limit:startRecord+loadSize
     },
     listeners:{

workflow/engine/templates/designer/index.html

@@ -101,13 +101,14 @@
         </nav>
 
     </section>
+    <div class="bpmn_shapes">
+    </div>
 <!--</div>-->
 <div id="p-center-layout"/>
     <!--BODY-->
     <div class="ui-layout-center tab-content" id="div-layout-canvas">
     </div>
-    <div class="bpmn_shapes">
-     </div>
+
     <section class="content" id="idContent">
 
         <div class="content_controls">

workflow/engine/xmlform/login/loginpm3.xml

@@ -98,7 +98,7 @@ function showGettingStarted() {
   panel.options = {
     size: {w:620,h:500},
     position: {x:50,y:50,center:true},
-    control: {close:true,resize:false},fx:{modal:true},
+    control: {close:true,resize:false, drag: false},fx:{modal:true},
     statusBar: false,
     fx: {shadow:true,modal:true}
   };