Changeset 17788

Timestamp:

07/28/08 10:41:59 (1 month ago)

Author:

avinash

Message:

blog :
- work capture UI for blog-it popup from assignments page
- some changes related PnWeblogEntry?

Files:

• trunk/core/src/net/project/hibernate/dao/impl/PnWeblogEntryDAOImpl.java (modified) (1 diff)
• trunk/core/src/net/project/hibernate/model/PnWeblogEntry.hbm.xml (modified) (1 diff)
• trunk/core/web/css/blog.css (modified) (2 diffs)
• trunk/core/web/jsp/resource/PersonalAssignments.jsp (modified) (4 diffs)
• trunk/core/web/src/blogit.js (modified) (12 diffs)

trunk/core/src/net/project/hibernate/dao/impl/PnWeblogEntryDAOImpl.java

@@ -25 +25 @@
-        public PnWeblogEntry getWeblogEntry(Integer weblogEntryId){
-                PnWeblogEntry entry = findByPimaryKey(weblogEntryId);
+                if(entry != null){
+                        Hibernate.initialize(entry);
+                }
-                return entry;
-        }

trunk/core/src/net/project/hibernate/model/PnWeblogEntry.hbm.xml

@@ -8 +8 @@
-                name="net.project.hibernate.model.PnWeblogEntry"
-                table="PN_WEBLOG_ENTRY"
-fals
+tru
-        >
-        

trunk/core/web/css/blog.css

@@ -18 +18 @@
-        position: absolute;
-        overflow: hidden;
-2
-10
+1
+6
-        margin: 0px;
-        background-color: #FFFFFF;
@@ -68 +68 @@
-        overflow-X: auto;
-}
+.blogbar {
+        background-color:#33BDFF;
+        border-collapse:collapse;
+        height:2px;
+        padding:0pt;
+}
+.redlink{
+        
+}
+.bluelink{
+        
+}

trunk/core/web/jsp/resource/PersonalAssignments.jsp

@@ -69 +69 @@
-<template:import type="css" src="/styles/global.css" />
-<template:import type="css" src="/styles/fonts.css" />
+<!-- BlogIt Style -->
+<template:import type="css" src="/styles/blog.css" />
-<template:getSpaceCSS />
-
@@ -80 +82 @@
-<template:import type="javascript" src="/src/util.js" />
-<template:import type="javascript" src="/src/window_functions.js" />
+<script language="javascript">
+var JSPRootURL = '<%= SessionManager.getJSPRootURL() %>'; 
+</script>
+<!-- BlogIt JS -->
+<template:import type="javascript" src="/src/blogit.js" />
-<template:getSpaceJS />
-
@@ -85 +92 @@
-var theForm;
-var isLoaded = false;
-
+
+
+
+
+
+
+
-
-function setup() {
@@ -277 +290 @@
-                <tb:button type="refresh" />
-                <tb:button type="help" />
+                <tb:button type="blogit" />
-        </tb:band>
-</tb:toolbar>

trunk/core/web/src/blogit.js

@@ +1 @@
+// Global Ajax events can be handled on every request!
+//Ext.Ajax.on('beforerequest', function(conn, options){ Ext.get(document.body).mask('Loading...');}, this);
+//Ext.Ajax.on('requestcomplete', function(conn, response, options){Ext.get(document.body).unmask()}, this);
+
-// String prototype function for triming white spaces
-String.prototype.trim = function(){
@@ -13 +17 @@
-blogPopupDialogue.style.display = 'block';
-blogPopupDialogue.style.height = 'auto';
-615px
+80%
-var blogPopupBody = document.createElement('div');
-blogPopupBody.id = 'blogPopupBody';
-blogPopupBody.style.display = 'block';
-blogPopupBody.style.height = 'auto';
-612px
+87%
-var blogActionDiv = document.createElement('div');
-blogActionDiv.style.left = '390px';
@@ -31 +35 @@
-blogActionDiv.innerHTML = '<h3>Saving...</h3>';
-
+var showtimediv=false;
-var objectId;
-var contentPanel;
@@ -40 +45 @@
-var fromTime = null;
-var toTime = null;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-function getHourOptions() {
-        var hrOptions = '';
@@ -61 +98 @@
-        if(typeof(blogItFor) != 'undefined' && blogItFor == 'assignments'){
-                if ((theForm.objectID) && (verifySelectionForField(theForm.objectID, "single", noSelectionErrMes))) {
-
-
-
-
+
+
+
-                                }
+                        } else {
+                                for (var i = 0; i < theForm.objectID.length; i++) {
+                                        if(theForm.objectID[i].checked == true) {
+                                                objectId = theForm.objectID[i].value;                                   
+                                                break;                                  
+                                        }
+                    }
-            }
-            var now = new Date();
-                        var today = now.getDate()+'/'+(now.getMonth()+1)+'/'+now.getFullYear();
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        timeSheetTable += '&nbsp;&nbsp; <select id="fromMinutes" name="fromMinutes"> <option value="-1">Mins</option>'+ getMinuteOptions() +'</select>&nbsp;&nbsp;';
-                        timeSheetTable += 'To : &nbsp;<select id="toHours" name="toHours"> <option value="-1">Hrs</option>'+ getHourOptions() +'</select>';
-                        timeSheetTable += '&nbsp;&nbsp; <select id="toMinutes" name="toMinutes"> <option value="-1">Mins</option>'+ getMinuteOptions() +'</select>';
-
+
+
+
+
+
+
-                        showPopup();
-                }
@@ -111 +229 @@
-        
-        if(typeof(blogItFor) != 'undefined' && blogItFor == 'assignments'){
-530px
-
-
-
-> Subject : </td> <td> <input id="title" maxlength="240" name="title" size="4
-
-
+100%
+
+
+ 
+ nowrap="nowrap" style="padding-left:30px"> Subject : </td> <td> <input id="title" maxlength="240" name="title" size="6
+ nowrap="nowrap" style="padding-left:30px"
+ style="padding-left:30px"
-        htmlText += ' &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-        htmlText += ' <input type="button" value="   Cancel   " onclick="hidePopup();" /> </td> </tr> </table>';
@@ -138 +256 @@
-        contentPanel = new Ext.FormPanel({
-                border: false,
-550
+'100%'
-                items: [{
-                        xtype: 'htmleditor',
-                        id: 'content',
-                        fieldLabel: 'Content',
-520
+'650px'
-                        height: 200,
-                        anchor: '95%',
@@ -152 +270 @@
-        
-        // getting number of blog entries if exist for selected object
-
+    
-}
-
@@ -163 +281 @@
-                showHtmlSelectTags();
-        }
-
+
+
-}
-
@@ -220 +339 @@
-                return false;
-        }
-
-
-
-
+
-                if(document.getElementById('fromHours').value != -1 && document.getElementById('fromMinutes').value != -1){
-                        fromTime = document.getElementById('fromHours').value +':'+ document.getElementById('fromMinutes').value
@@ -230 +346 @@
-                        toTime = document.getElementById('toHours').value +':'+ document.getElementById('toMinutes').value      
-                }
-workDate == null || 
+
-                        return false;
-                } 
-
+*/
-        return true;
-}
@@ -357 +473 @@
-                   contentPanel = new Ext.FormPanel({
-                           border: false,
- 550
+'100%'
-                           items: [{
-                                   xtype: 'htmleditor',
-                                   id: 'content',
-                                   fieldLabel: 'Content',
-520
+'650px'
-                                   height: 200,
-                                   anchor: '95%',