Changeset 18320

Timestamp:

11/10/08 12:25:39 (2 months ago)

Author:

avinash

Message:

blog : fixed for following bugs
- The text entered in the Message field of Blog is not fully displayed in the Blog entries list
- Mismatch of Message field caption in Create Blog and Edit Blog dialog
- Blog entries allowed to be deleted without any confirmation
- Unable to delete a Blog entry
- The Hide pictures option must be changed to Show pictures
- "Important?" selection info is not instantly displayed in IE7 browser
- Title bar is missing in the New comment window.
- Vertical scroll bar is not displayed in the Blog page after editing a Blog entry in IE
- Lose vertical scrollbars after closing blog dialog

Files:

• trunk/core/db/oracle/create-scripts/versions/8.5.0/update_system_properties.sql (modified) (1 diff)
• trunk/core/src/net/project/view/pages/blog/ViewBlog.java (modified) (3 diffs)
• trunk/core/web/css/noframes.css (modified) (1 diff)
• trunk/core/web/html/blog/BlogEntries.html (modified) (1 diff)
• trunk/core/web/html/blog/BlogEntry.html (modified) (1 diff)
• trunk/core/web/html/blog/ViewBlog.html (modified) (1 diff)
• trunk/core/web/src/blogit.js (modified) (6 diffs)

trunk/core/db/oracle/create-scripts/versions/8.5.0/update_system_properties.sql

@@ -1139 +1139 @@
-      p.property = 'prm.document.importobject.invalid.file.path';
-
+insert into pn_property (CONTEXT_ID, LANGUAGE, PROPERTY_TYPE, PROPERTY, PROPERTY_VALUE, PROPERTY_VALUE_CLOB,RECORD_STATUS,IS_SYSTEM_PROPERTY,IS_TRANSLATABLE_PROPERTY) 
+values (2000,'en','text','prm.blog.viewblog.confirmdeleteblogentry.message','Are you sure to delete this blog entry?','','A',0,1);
+
+update pn_property p set
+      p.property_value = 'Message :'
+where
+      p.context_id = 2000 and
+      p.language = 'en' and
+      p.property = 'prm.blog.addweblogentrycomment.content.label';
+
+update pn_property p set
+      p.property_value = 'Message :'
+where
+      p.context_id = 2000 and
+      p.language = 'en' and
+      p.property = 'prm.blog.addweblogentry.content.label';
+
-commit;
-prompt 0 records loaded

trunk/core/src/net/project/view/pages/blog/ViewBlog.java

@@ -225 +225 @@
-        private IPnClassService pnClassService;
-        
+        private String confirmDeleteBlogEntryMessage;  
+        
-        private enum BlogAction {
-                TEAMMORE, PROJECTBLOG, PERSONALBLOG, SHOW_BLOG_ENTRIES_FOR_OBJECT, FILTER_BLOG_ENTRIES, GET_LAST_BLOG_ENTRY, LOAD_BLOG_ENTRIES
@@ -255 +257 @@
-                        validationMessageForBlogEntry = PropertyProvider.get("prm.blog.addweblogentry.validation.message");
-                        validationMessageForBlogComment = PropertyProvider.get("prm.blog.addweblogentrycomment.validation.message");
+                        confirmDeleteBlogEntryMessage = PropertyProvider.get("prm.blog.viewblog.confirmdeleteblogentry.message");
-                } catch (Exception e) {
-                        log.error("Error occured while getting property tokens : " + e.getMessage());
@@ -1407 +1410 @@
-                this.teamMemberId = teamMemberId;
-        }
-
+
+
+
+
+
+
+
+
-}

trunk/core/web/css/noframes.css

@@ -1102 +1102 @@
-        font-size: 12px;
-        color: Black;
-line-height: 20px;
+/*line-height: 20px;*/
-        padding-bottom: 0px;
-

trunk/core/web/html/blog/BlogEntries.html

@@ -154 +154 @@
-                                                                        <t:parameter name="else">
-                                                                                <t:if test="showDeleteLink">
-
-
-
+
-                                                                                </t:if>
-                                                                        </t:parameter>

trunk/core/web/html/blog/BlogEntry.html

@@ -68 +68 @@
-                                        ${editLink}</a>
-                                </t:if>
-
-
-
-
+
+
+
+
+
+
-                                </t:if>
-                        </t:if>

trunk/core/web/html/blog/ViewBlog.html

@@ -153 +153 @@
-var startDate, endDate,posts;
-var teamMemberId = '${teamMemberId}';
+var confirmDeleteBlogEntryMessage = '${confirmDeleteBlogEntryMessage}';
+
+<!-- //
-// initializing content panel with html editor
-
-<!-- //
-function initializeContentPanel(){
-    Ext.QuickTips.init();

trunk/core/web/src/blogit.js

@@ -260 +260 @@
-                // including important checkbox for blog entry on blog page and my assignments page
-                subText += '<td width="77"></td><td class="table-content-done" nowrap="nowrap">&nbsp;';
-hange
+lick
-                subText += '&nbsp;<span id="importantMsg" class="show-message" style="display: none;">Explain why this entry is important</span></td>';
-        } else {
@@ -374 +374 @@
-        document.getElementsByTagName('body')[0].removeChild(blogPopupScreen);
-        if(navigator.userAgent.toLowerCase().indexOf("msie") >= 0) {
-
-
+
+
+
+
+
+
-                } else {
-
+
+
-                }
-                showHtmlSelectTags();
@@ -747 +752 @@
-        });
-}
-
-// creating a blog if not exist for blog type personal/project
-function createBlog(blogType, objectId, objectType){
@@ -802 +806 @@
-           method: 'POST',
-           success: function(result, request){
-
+
+
+
+
+
+
+
+
+
-                   // Initializing Ext QuickTips before creating htmleditor
-                   Ext.QuickTips.init();
@@ -1033 +1045 @@
-        }
-        if(fullEntriesView) {
-
-
-
+
+
+
+
+
+
+
-                }
-        } else {
@@ -1181 +1197 @@
-
-// to delete blog entry (blog entry can be deleted by space administrator)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        });
-}