Changeset 17914

Timestamp:

08/20/08 09:10:33 (3 months ago)

Author:

uroslates

Message:

- Applying new UI for wiki
- fixing issues found by testing team.
- tests fix (updated wiki system properties).

Files:

• trunk/core/build.xml (modified) (1 diff)
• trunk/core/db/oracle/create-scripts/versions/8.5.0/update_system_properties.sql (modified) (1 diff)
• trunk/core/lib/bliki-3.0.0.jar (deleted)
• trunk/core/lib/bliki-3.0.2.jar (added)
• trunk/core/src/net/project/hibernate/dao/IPnWikiPageDAO.java (modified) (1 diff)
• trunk/core/src/net/project/hibernate/dao/impl/PnWikiPageDAOImpl.java (modified) (1 diff)
• trunk/core/src/net/project/hibernate/service/IPnWikiPageService.java (modified) (1 diff)
• trunk/core/src/net/project/hibernate/service/IWikiProvider.java (modified) (2 diffs)
• trunk/core/src/net/project/hibernate/service/impl/PnWikiPageServiceImpl.java (modified) (1 diff)
• trunk/core/src/net/project/hibernate/service/impl/WikiProviderImpl.java (modified) (4 diffs)
• trunk/core/src/net/project/view/pages/wiki/EditWikiPage.java (modified) (4 diffs)
• trunk/core/src/net/project/view/pages/wiki/Upload.java (modified) (1 diff)
• trunk/core/src/net/project/view/pages/wiki/Welcome.java (modified) (5 diffs)
• trunk/core/src/net/project/view/pages/wiki/WikiHistory.java (modified) (3 diffs)
• trunk/core/src/net/project/wiki/ExtWikiModel.java (modified) (6 diffs)
• trunk/core/web/css/wiki.css (modified) (3 diffs)
• trunk/core/web/html/resource/management/components/WikiInfo.html (modified) (1 diff)
• trunk/core/web/html/resource/management/components/WikiMenu.html (modified) (1 diff)
• trunk/core/web/html/wiki/EditWikiPage.html (modified) (5 diffs)
• trunk/core/web/html/wiki/Upload.html (modified) (4 diffs)
• trunk/core/web/html/wiki/Welcome.html (modified) (4 diffs)
• trunk/core/web/html/wiki/WikiHistory.html (modified) (3 diffs)
• trunk/core/web/images/wiki/editpanel_bold.png (added)
• trunk/core/web/images/wiki/editpanel_br.png (added)
• trunk/core/web/images/wiki/editpanel_font.png (added)
• trunk/core/web/images/wiki/editpanel_italics.png (added)
• trunk/core/web/images/wiki/editpanel_line.png (added)
• trunk/core/web/images/wiki/editpanel_paragraph.png (added)
• trunk/core/web/images/wiki/editpanel_symbol.png (added)
• trunk/core/web/images/wiki/editpanel_web.png (added)
• trunk/core/web/images/wiki/h1corner-bottom.png (added)
• trunk/core/web/images/wiki/h1corner-top.png (added)
• trunk/test/acceptance/src/net/project/test/acceptance/wiki/BasicWikiFeaturesTest.java (modified) (2 diffs)
• trunk/test/acceptance/src/net/project/test/acceptance/wiki/WikiBase.java (modified) (2 diffs)

trunk/core/build.xml

@@ -383 +383 @@
-
-                        <pathelement location="${build.lib.dir}\roller-core.jar" />
-0
+2
-                        <pathelement location="${build.lib.dir}\htmllexer.jar" />
-                        <pathelement location="${build.lib.dir}\htmlparser.jar" />

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

@@ -184 +184 @@
-      p.property = 'all.global.toolbar.standard.remove.alt';
-
+update pn_property p set 
+       p.property_value = 'Viewing Page'
+where 
+      p.context_id = 2000 and
+      p.language = 'en' and
+      p.property = 'prm.wiki.view.viewTitle';
+
+update pn_property p set 
+       p.property_value = 'Editing Page'
+where 
+      p.context_id = 2000 and
+      p.language = 'en' and
+      p.property = 'prm.wiki.edit.editTitle';
+
+update pn_property p set 
+       p.property_value = 'History For Wiki Page'
+where 
+      p.context_id = 2000 and
+      p.language = 'en' and
+      p.property = 'prm.wiki.history.historyTitle';
+
+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.wiki.edit.describe.label','Edit summary (describe the changes you have made):','','A',0,1);
+
-commit;
-prompt 0 records loaded

trunk/core/src/net/project/hibernate/dao/IPnWikiPageDAO.java

@@ -48 +48 @@
-         */
-        public List<PnWikiPage> getAllImageDetailPagesForWiki(Integer ownerObjectId, String objectName, String recordStatus);
-
+
+
+
+
+
+
+
+
-}

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

@@ -223 +223 @@
-                return resultList;
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}

trunk/core/src/net/project/hibernate/service/IPnWikiPageService.java

@@ -89 +89 @@
-         */
-        public List<PnWikiPage> getSubPages(PnWikiPage pnWikiPage);
+        
+        /**
+         * Method for getting list of <b>Recent Changes</b> for one wiki space.
+         * @param spaceId wiki space we are searching in
+         * @param rangeNumber number of pages to return
+         * @param namespace the namespace of pages to return (eg Image...)
+         * @return list of recent changed pages
+         */
+        public List<PnWikiPage> getRecentChangesForWiki(Integer spaceId, int rangeNumber, String namespace);
-}

trunk/core/src/net/project/hibernate/service/IWikiProvider.java

@@ -5 +5 @@
-
-import java.util.List;
+import java.util.TreeMap;
-
-import javax.servlet.http.HttpSession;
@@ -45 +46 @@
-        
-        public String wikiPagesIndex();
+        
+        public String recentChanges(int number, String namespace);
-}

trunk/core/src/net/project/hibernate/service/impl/PnWikiPageServiceImpl.java

@@ -136 +136 @@
-                return pnWikiPageDAO.getSubPages(pnWikiPage);
-        }
+        
+        public List<PnWikiPage> getRecentChangesForWiki(Integer spaceId, int rangeNumber, String namespace) {
+                //get number of pages from specified wiki space declared by rangeNumber
+                return pnWikiPageDAO.getWikiPagesByDate(spaceId, rangeNumber, namespace);
+        }
-}

trunk/core/src/net/project/hibernate/service/impl/WikiProviderImpl.java

@@ -7 +7 @@
-import java.net.URLEncoder;
-import java.util.ArrayList;
+import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
@@ -468 +469 @@
-                                Iterator it3 = pagesForLetter.iterator();
-                                //loop through all pages with same first letter
+                                indexStr.append("<div id=\"pagesWithFirstLetter\" style=\"padding-left:15px; padding-top:5px;\">");
-                                while( it3.hasNext() ) {
-                                        PnWikiPage currPg = (PnWikiPage) it3.next();
@@ -483 +485 @@
-                                        indexStr.append(". . . . . . <b>Last Editor:</b> " + currPg.getEditedBy().getDisplayName() + ", <b>edited on:</b> " + SessionManager.getUser().getDateFormatter().formatDate(currPg.getEditDate(), "EEE, MMM dd, yyyy. hh:mm:ss") + "<br/>");
-                                }
-
+indexStr.append("</div>");
-                                indexStr.append("</div><br/>");
-                        }
@@ -496 +498 @@
-        }
-
+        /**
+         *  Method for creating page <b>Recent Changes</b> list for wiki space we are in.
+         */
+        public String recentChanges(int range, String namespace) {
+                String resultString = null;
+                IPnWikiPageService wikiPageService = ServiceFactory.getInstance().getPnWikiPageService();
+                String[] monthName = {"Jan", "Feb", "Mar", "Apr", "May", "June", "July", "Aug", "Sept", "Oct", "Nov", "Dec"};
+                
+                Map <String, List<PnWikiPage>> tMap = new HashMap<String, List<PnWikiPage>>();
+                //get list of all wiki pages in current object space
+                List<PnWikiPage> pages = wikiPageService.getRecentChangesForWiki(Integer.valueOf(SessionManager.getUser().getCurrentSpace().getID()), range, namespace);
+                
+                //filling in the map with wiki pages - indexed by date
+                Iterator it = pages.iterator();
+                while ( it.hasNext() ) {
+                        PnWikiPage currPage = (PnWikiPage) it.next();
+                        Calendar c = Calendar.getInstance(); 
+                        c.setTime(currPage.getEditDate()); 
+                        String date = c.get(Calendar.DAY_OF_MONTH) + "/" + monthName[c.get(Calendar.MONTH)] + "/" + c.get(Calendar.YEAR);
+
+                        //if initial letter of current page is contained in map add
+                        if ( tMap.containsKey(date) ) {
+                List<PnWikiPage> list = tMap.get(date);
+                list.add(currPage);
+                tMap.put(date, list);
+            } else {
+                //there is no key for this letter in the map
+                List<PnWikiPage> list = new ArrayList<PnWikiPage>();
+                list.add(currPage);
+                tMap.put(date, list);
+            }
+                }
+                
+        //read the map for presenting index
+                resultString = renderRecentChanges(tMap);
+                
+                return resultString;
+        }
+        
+        @SuppressWarnings("unchecked")
+        private String renderRecentChanges(Map pgIndMap) {
+                String result = null;
+                
+                //read the map for presenting index
+                if(pgIndMap != null) {
+                        StringBuffer indexStr = new StringBuffer("<div id=\"recentChanges\">");
+                        indexStr.append("<h3 id=\"recentChangesTitle\">Recent Changes <span style=\"position:absolute;right:70px;\">[<a href=\"javascript:hideRecentChanges();\" style=\"padding: 2px;\">Exit</a>]</span></h3><br/><br/>");
+                        indexStr.append("<div style=\"background: #EEEEEE none repeat scroll 0%; border: 1px solid #CCCCCC; float: left; margin-right: 15px; padding: 4px; text-align: left; width: 60%; \"> This is a list of recently changed wiki pages in this wiki space. </div><br/><br/>");
+                        indexStr.append("<strong><b>");
+                        indexStr.append("<a href=\"javascript:reset();\">All</a> ");
+                        //Use an Iterator to traverse the mappings in the Map.  
+                Iterator it1 = pgIndMap.entrySet().iterator();
+                while ( it1.hasNext() ) {
+                    Map.Entry entry = (Map.Entry) it1.next();
+                    indexStr.append("<a href=\"#" + entry.getKey() + "\">" + entry.getKey() + "</a>&nbsp; ");
+                }
+                        indexStr.append("</b></strong><br/><br/><br/>");
+                        
+                        Iterator it2 = pgIndMap.entrySet().iterator();
+                        //loop through entire map
+                while( it2.hasNext() ) {
+                    Map.Entry entry = (Map.Entry) it2.next();
+                        indexStr.append("<div id=\"" + entry.getKey() + "\">");
+                                indexStr.append("<strong><b>" + entry.getKey() + "</b></strong><br/>");
+                                List<PnWikiPage> pagesForLetter = (List<PnWikiPage>) entry.getValue();
+                                
+                                Iterator it3 = pagesForLetter.iterator();
+                                //loop through all pages with same first letter
+                                indexStr.append("<div id=\"changesFromDate\" style=\"padding-left:15px; padding-top:5px;\">");
+                                while( it3.hasNext() ) {
+                                        PnWikiPage currPg = (PnWikiPage) it3.next();
+                                        User user = SessionManager.getUser();
+                                        String hrefLink = null;
+                                        try {
+                                                hrefLink = SessionManager.getJSPRootURL() + "/wiki/EditWikiPage/" + currPg.getPageName()
+                                                + "/" + currPg.getParentPageName() + "/"+ URLEncoder.encode(user.getCurrentSpace().getID(), SessionManager.getCharacterEncoding()) 
+                                                + "/" + URLEncoder.encode(user.getID(), SessionManager.getCharacterEncoding()) + "?module=" + Module.PROJECT_SPACE;
+                                        } catch (UnsupportedEncodingException e) {
+                                                e.printStackTrace();
+                                        }
+
+                                        indexStr.append("<a href=\"" + hrefLink + "\">" + currPg.getPageName() + "</a> ");
+                                        indexStr.append(". . . . . . <b>Last Editor:</b> " + currPg.getEditedBy().getDisplayName() + ", <b>edited on:</b> " + SessionManager.getUser().getDateFormatter().formatDate(currPg.getEditDate(), "EEE, MMM dd, yyyy. hh:mm:ss") + "<br/>");
+                                }
+                                indexStr.append("</div>");
+                                indexStr.append("</div><br/>");
+                        }
+                        
+                        indexStr.append("</div>");
+                        result = indexStr.toString();
+                } else {
+                        result = "<br/><strong>This wiki doesn't contain any pages!</strong><br/>";
+                }
+                
+                return result;
+        }
+        
-}

trunk/core/src/net/project/view/pages/wiki/EditWikiPage.java

@@ -116 +116 @@
-        private RequestGlobals requestGlobals;
-        
+        private String describeEditLabel;
+        
+        private String desciption;
+        
-        /**
-         * default constructor
@@ -125 +129 @@
-                        setAction("");
-                        jspRootURL = SessionManager.getJSPRootURL();
-
+
+
-                        pnWikiPageService = ServiceFactory.getInstance().getPnWikiPageService();
-                        personService = ServiceFactory.getInstance().getPnPersonService();
@@ -262 +267 @@
-                                pnWikiPage = new PnWikiPage();
-                                pnWikiPage.setContent(getContent());
+//added for edit description
+
+//
-                                pnWikiPage.setEditDate(currentDate);
-                                pnWikiPage.setEditedBy(pnPerson);
@@ -644 +652 @@
-                this.moduleId = moduleId;
-        }
+        
+        public String getDescribeEditLabel() {
+                return describeEditLabel;
+        }
+
+        public String getDesciption() {
+                return desciption;
+        }
+
+        public void setDesciption(String desciption) {
+                this.desciption = desciption;
+        }
-}

trunk/core/src/net/project/view/pages/wiki/Upload.java

@@ -134 +134 @@
-        }
-        
-
-
+
-                System.out.println("\n****\n...Uploading file uploadedFile: " + getUploadedFile().getFileName() + "\npageName: " + getPageName() +
-                                "\ndescription: " + getDescription() + "\nuser: " + SessionManager.getUser().getDisplayName() + 

trunk/core/src/net/project/view/pages/wiki/Welcome.java

@@ -12 +12 @@
-import net.project.base.Module;
-import net.project.base.property.PropertyProvider;
-import net.project.form.FormManager;
-import net.project.hibernate.model.PnPerson;
-import net.project.hibernate.model.PnProjectSpace;
@@ -39 +38 @@
-import org.apache.tapestry.annotations.InjectPage;
-import org.apache.tapestry.annotations.Persist;
-import org.apache.tapestry.beaneditor.Validate;
-import org.apache.tapestry.corelib.components.Form;
-import org.apache.tapestry.services.RequestGlobals;
@@ -178 +176 @@
-        @Inject
-        private RequestGlobals requestGlobals;
+        
+        private String wikiRecentChanges;
-        
-        //added to process after selecting image to attach from selectObject.
@@ -240 +240 @@
-                setModuleId(Module.PROJECT_SPACE);
-                setWikiPgIndex(wikiProvider.wikiPagesIndex());
+                setWikiRecentChanges(wikiProvider.recentChanges(10, null));
-        }
-        
@@ -1097 +1098 @@
-                return viewTitle;
-        }
+
+        public String getWikiRecentChanges() {
+                return wikiRecentChanges;
+        }
+
+        public void setWikiRecentChanges(String wikiRecentChanges) {
+                this.wikiRecentChanges = wikiRecentChanges;
+        }
-}

trunk/core/src/net/project/view/pages/wiki/WikiHistory.java

@@ -11 +11 @@
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import net.project.base.Module;
@@ -26 +25 @@
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.log4j.Logger;
-import org.apache.tapestry.StreamResponse;
-import org.apache.tapestry.annotations.ApplicationState;
-import org.apache.tapestry.annotations.Inject;
@@ -33 +31 @@
-import org.apache.tapestry.services.RequestGlobals;
-import org.apache.tapestry.util.TextStreamResponse;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**

trunk/core/src/net/project/wiki/ExtWikiModel.java

@@ -7 +7 @@
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-
-import net.project.base.Module;
@@ -22 +21 @@
-import org.htmlcleaner.Utils;
-
-import info.bliki.wiki.addon.model.AddonConfiguration;
-import info.bliki.wiki.filter.Encoder;
-import info.bliki.wiki.filter.WikipediaParser;
@@ -42 +40 @@
-        
-        public ExtWikiModel(String imageBaseURL, String linkBaseURL) {
+                //super(AddonConfiguration.DEFAULT_CONFIGURATION, imageBaseURL, linkBaseURL);
-                super(imageBaseURL, linkBaseURL);
-                //super(imageBaseURL, linkBaseURL);
-        }
-
@@ -254 +252 @@
-                StringBuffer result = new StringBuffer("<br/>\n");
-                
-
+
+
-                if(!linksIt.hasNext()) {
-                        result.append(" <b> This page has no wiki links! </b>");
@@ -260 +259 @@
-                if ( linksIt.hasNext() ) {
-                        //style=\"margin-left: auto;margin-right: auto; padding: 5px;background: rgb(249, 249, 249);\"
- This Page Links To: </b>
+This Page Links To:</b>&nbsp;&nbsp;
-                        while( linksIt.hasNext() ) {
-                                String currentLink = (String) linksIt.next();
@@ -279 +278 @@
-        
-        public ExtWikiModel(String imageBaseURL, String linkBaseURL, boolean isPreview) {
-
+
+
-                this.isPreview = isPreview;
-        }

trunk/core/web/css/wiki.css

@@ -1 @@
-iki
+
-ul, ol { 
-        margin: 0.1em 0 0 0;
-        padding: 0pt 1.65em;
-}
-iki
+
-ul{
-        list-style-image: inherit;
@@ -10 +10 @@
-        list-style-type: disc;
-}
-iki
+
-ol{
-        list-style-image: inherit;
@@ -133 +133 @@
-font-size:1.6em;
-}
+
+//////////////////////////////////////////////////// new UI
+
+/* CSS Document */
+
+body {
+        padding: 0;
+        margin: 0;
+        background: url(../images/back.jpg) repeat-x top;
+}
+
+* a:hover {
+        text-decoration: none;
+}
+
+#left {
+        float: left;
+        width: 196px;
+}
+
+/* PROJECTS Left Heading */
+#leftheading-projects {
+        background: url(../images/menu/leftheading_projects.png);
+        width: 160px;
+        height: 23px;
+        padding-left: 14px;
+        margin-top: 23px;
+        float: left;
+        font-family: Tahoma, Trebuchet;
+        font-size: 18px;
+}
+
+.left_column_top {
+        background: #eceef6 url(../images/leftcolumn_top.png) no-repeat top;
+        width: 174px;
+        margin-top: 23px;
+        padding-top: 10px;
+        
+}
+.left_column_bottom {
+        background: url(../images/leftcolumn_bottom.png) no-repeat bottom;
+        width: 174px;
+        padding-bottom: 10px;
+        float: left;
+}
+div.actionbox-item {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 13px;
+        padding-left: 14px;
+        background: #eceef6;
+        color: #3399ff;
+        font-weight: bold;
+        line-height: 22px;
+}
+div.actionbox-item span a, .group_heading span a  {
+        text-decoration: none;
+        border-bottom: 1px dashed;
+        color: #3399ff;
+}
+div.actionbox-item span a.disabled, .group_heading span a.disabled  {
+        text-decoration: none;
+        color: Silver;
+        border-bottom: 1px solid #E4E4E4;
+        cursor: help;
+}
+div.actionbox-item span a:hover, .group_heading span a:hover {
+        color: #3366CC;
+}
+
+.group_heading {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 13px;
+        padding-left: 14px;
+        margin-top: 10px;
+        background: #eceef6;
+        font-weight: bold;
+}
+.group_heading span {
+        padding-left: 10px;
+        font-size: 11px;
+        line-height: 20px;
+}
+
+
+#search {
+        position: absolute;
+   right: 10px;
+        top: 32px;
+}
+#search input {
+        height: 20px;
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 11px;
+        background: url(../images/form_search.png) no-repeat;
+        border: 0px;
+        padding-left: 27px;
+        padding-top: 2px;
+        width: 248px;
+}
+
+.black {color: Black;} .gray {color: Gray;}
+
+#content a:hover {
+        text-decoration: underline;
+}
+.arrow {
+        font-size: 8px;
+}
+
+#content-left {
+        padding-top: 6px;
+        width: 370px;
+        float: left;
+}
+
+.table {
+        margin-top: 7px;
+        line-height: 16px;
+}
+
+#content-right {
+        padding-top: 6px;
+        padding-left: 375px;
+}
+
+#content-rightborder {
+        border-left: 2px solid #dcdcdc;
+        padding-left: 10px;
+        height: 100%;
+}
+
+/* Wiki page */
+.project-title {
+        font-family: Tahoma;
+        font-size: 19px;
+        padding-left: 14px;
+        margin-top: 4px;
+        margin-bottom: 2px;
+        float: left;
+        width: 180px;
+        color: Navy;
+}
+.project-descrition {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 13px;
+        padding-left: 14px;
+        margin-top: 2px;
+        margin-bottom: 4px;
+        float: left;
+        width: 180px;
+}
+.project-descrition a {
+        color: Navy;
+}
+
+#search-wiki {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 13px;
+        padding-left: 14px;
+        margin-top: 0px;
+        margin-bottom: 4px;
+        float: left;
+}
+#wiki-page {
+        width: 100%;
+        height: auto;
+}
+#wiki-page h1 {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 22px;
+        height: 30px;
+        background: #f3f3fa url(../images/wiki/h1corner-top.png) no-repeat top left;
+        padding-top: 20px;
+        padding-left: 12px;
+        vertical-align: bottom;
+        border-bottom: 2px solid Silver;
+}
+#wiki-page h2 {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 18px;
+        margin-right: 15px;
+        margin-left: 12px;
+        padding-top: 5px;
+        border-bottom: 1px solid Silver;
+        font-weight: normal;
+}
+#wiki-page h3 {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 16px;
+        font-weight: normal;
+        margin-right: 15px;
+        margin-left: 12px;
+        padding-top: 5px;
+        border-bottom: 1px solid Silver;
+}
+#wiki-page p {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 14px;
+        margin-left: 12px;
+        margin-right: 15px;
+        margin-top: 0px;
+        line-height: 22px;
+}
+#wiki-page p a {
+        color: Navy;
+        text-decoration: none;
+}
+#wiki-page p a:hover, #wiki-page #contents-block * a:hover {
+        text-decoration: underline;
+}
+#wiki-page .ending {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 13px;
+        height: 10px;
+        background: #f3f3fa url(../images/wiki/h1corner-bottom.png) no-repeat bottom left;
+        padding-top: 6px;
+        padding-bottom: 14px;
+        padding-left: 12px;
+        margin-bottom: 10px;
+        border-top: 2px solid Silver;
+}
+#wiki-page .ending a, #wiki-page .ending a:visited {
+        text-decoration: none;
+        border-bottom: 1px dashed;
+        color: #3399ff;
+}
+#wiki-page .ending a:hover {
+        color: #3366CC;}
+
+#wiki-page #contents-block {
+        background: #f3f3fa;
+        margin-left: 60px;
+        padding-right: 12px;
+        padding-bottom: 2px;
+        padding-top: 5px;
+        width: 320px;
+        height: auto;
+        border: 1px solid Silver;
+}
+#wiki-page #contents-block h5 {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 14px;
+        font-weight: bold;
+        text-align: center;
+        margin-top: 10px;
+}
+#wiki-page #contents-block h5 span {
+        font-size: 12px;
+        font-weight: normal;
+        line-height: 0px;
+}
+#wiki-page #contents-block ul {
+        list-style: decimal outside;
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 14px;
+        line-height: 19px;
+        color: Navy;
+}
+#wiki-page #contents-block * a {
+        color: Navy;
+        text-decoration: none;
+}
+
+/* Wiki Upload page */
+
+
+/* Wiki Edit page */
+#wiki-page #edit-panel {
+        height: 27px;
+        padding-left: 12px;
+}
+#wiki-page #edit-panel span {
+        padding-right: 1px;
+}
+#wiki-page .form {
+        padding-left: 12px;
+}
+#wiki-page .form textarea {
+        font-family: "Courier New", Courier, monospace;
+        font-size: 13px;
+        margin-bottom: 10px;
+        width: 95%;
+}
+#wiki-page .form input {
+        margin-bottom: 10px;
+}
+
+#wiki-page .form span {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 13px;
+        padding-top: 5px;
+        font-weight: bold;
+}
+
+#viewingWiki {
+         overflow: auto; 
+         width: 1050px; 
+         height: 50px; 
+         position: absolute; 
+         left: 196px; 
+         margin-top: 37px;
+         background: #f3f3fa url(../images/wiki/h1corner-top.png) no-repeat top left;
+         border-bottom: 2px solid Silver;
+}

trunk/core/web/html/resource/management/components/WikiInfo.html

@@ -1 @@
- style="overflow: auto; width: 990px; height: 50px; position: absolute; left: 265px; top: 85px; background: RGB(249, 249, 249)"
+> <!-- style="overflow: auto; width: 990px; height: 50px; position: absolute; left: 265px; top: 85px; background: RGB(249, 249, 249)" --
-        <table width="100%" bgcolor="RGB(249, 249, 249)">
-                <tr valign="top">

trunk/core/web/html/resource/management/components/WikiMenu.html

@@ -50 +50 @@
-        </script>
-
-
-
-
-
-
-
-
-
-
-
-
-
-