Merge branch '2.0' of git.colosa.net:processmaker into 2.0

workflow/engine/classes/model/Process.php

@@ -564,9 +564,10 @@ class Process extends BaseProcess {
     while( $dt->next() ) {
       $row = $dt->getRow();
       // verify if the title is already set on the current language
-      if ( $row['CON_CATEGORY'] == 'PRO_TITLE' && trim($row['CON_VALUE']) == '') {
+      if ( ($row['CON_CATEGORY'] == 'PRO_TITLE'  || $row['CON_CATEGORY'] == 'PRO_DESCRIPTION') && trim($row['CON_VALUE']) == '') {
       	// if not, then load the record to generate content for current language
-        $row = $this->load($row['CON_ID']);
+        $proData = $this->load($row['CON_ID']);
+        $row['CON_VALUE'] = $row['CON_CATEGORY'] == 'PRO_TITLE' ? $proData['PRO_TITLE'] : $proData['PRO_DESCRIPTION']; 
       } 
       $processesDetails[ $row['CON_ID']] [$row['CON_CATEGORY']] = $row['CON_VALUE'];
     }

workflow/engine/skinEngine/base/css/style.css

@@ -320,7 +320,7 @@ span.XtreeMinus:hover
 /* Menues */
 
 TD.mainMenuBG {
-	background-image: url(/skins/ext/images/gray/toolbar/bg.gif);
+	background-image: url(/images/ext/gray/toolbar/bg.gif);
 	background-repeat: repeat-x;
 	/*height: 25px;*/
 	left: 46px;
@@ -895,7 +895,7 @@ font-weight:bold;
 	overflow:hidden;
 	text-align: center;
 	background-color:#F2F2F2;
-	background-image:url("/skins/ext/images/gray/grid/grid3-hrow2.gif");
+	background-image:url("/images/ext/gray/grid/grid3-hrow2.gif");
 	background-position: bottom;
 
 }

workflow/engine/templates/processes/main.js

@@ -398,7 +398,7 @@ function newProcess(){
     editable : false,
     width: 180,
     allowBlank : true,
-      
+    value: '',
     store : new Ext.data.Store( {
       autoLoad: true,  //autoload the data
       proxy : new Ext.data.HttpProxy( {
@@ -415,6 +415,10 @@ function newProcess(){
       })
     })
   });
+  ProcessCategories.store.on('load',function(store) {
+    ProcessCategories.setValue(store.getAt(0).get('CATEGORY_UID'));
+  });
+
 
   var frm = new Ext.FormPanel( {
     id: 'newProcessForm',
@@ -425,7 +429,8 @@ function newProcess(){
         id: 'PRO_TITLE',
         fieldLabel: _('ID_TITLE'), 
         xtype:'textfield',
-        width: 260
+        width: 260,
+        allowBlank: false
       },  {
         id: 'PRO_DESCRIPTION',
         fieldLabel: _('ID_DESCRIPTION'),