Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Controller-ified and cleaned up most other pages (up to author, going by

UI sidebar/behavioral order)
  • Loading branch information...
commit 1342515a1be7987c08f888e3e037690ec5e5654c 1 parent aa0784c
@jesse-gallagher jesse-gallagher authored
Showing with 1,100 additions and 753 deletions.
  1. +4 −1 disk-collaborationtoday/.settings/org.eclipse.core.resources.prefs
  2. +28 −0 disk-collaborationtoday/Code/Java/controller/about.java
  3. +15 −0 disk-collaborationtoday/Code/Java/controller/about.java.metadata
  4. +29 −0 disk-collaborationtoday/Code/Java/controller/add.java
  5. +15 −0 disk-collaborationtoday/Code/Java/controller/add.java.metadata
  6. +93 −0 disk-collaborationtoday/Code/Java/controller/author.java
  7. +15 −0 disk-collaborationtoday/Code/Java/controller/author.java.metadata
  8. +19 −0 disk-collaborationtoday/Code/Java/controller/contact.java
  9. +15 −0 disk-collaborationtoday/Code/Java/controller/contact.java.metadata
  10. +0 −1  disk-collaborationtoday/Code/Java/controller/follow.java
  11. +16 −0 disk-collaborationtoday/Code/Java/controller/mod.java
  12. +15 −0 disk-collaborationtoday/Code/Java/controller/mod.java.metadata
  13. +17 −0 disk-collaborationtoday/Code/Java/controller/modApproved.java
  14. +16 −0 disk-collaborationtoday/Code/Java/controller/modApproved.java.metadata
  15. +16 −0 disk-collaborationtoday/Code/Java/controller/modPopular.java
  16. +16 −0 disk-collaborationtoday/Code/Java/controller/modPopular.java.metadata
  17. +24 −0 disk-collaborationtoday/Code/Java/controller/modSpotlight.java
  18. +16 −0 disk-collaborationtoday/Code/Java/controller/modSpotlight.java.metadata
  19. +35 −0 disk-collaborationtoday/Code/Java/controller/modTopStories.java
  20. +15 −0 disk-collaborationtoday/Code/Java/controller/modTopStories.java.metadata
  21. +14 −0 disk-collaborationtoday/CustomControls/bsControlGroup.xsp
  22. +21 −0 disk-collaborationtoday/CustomControls/bsControlGroup.xsp-config
  23. +16 −0 disk-collaborationtoday/CustomControls/bsControlGroup.xsp.metadata
  24. +72 −170 disk-collaborationtoday/CustomControls/moderationNewsEntry.xsp
  25. +12 −2 disk-collaborationtoday/CustomControls/moderationNewsEntry.xsp-config
  26. +14 −9 disk-collaborationtoday/CustomControls/moderationNewsEntry.xsp.metadata
  27. +18 −0 disk-collaborationtoday/Resources/StyleSheets/add.css
  28. +17 −0 disk-collaborationtoday/Resources/StyleSheets/add.css.metadata
  29. +7 −0 disk-collaborationtoday/Resources/StyleSheets/author.css
  30. +17 −0 disk-collaborationtoday/Resources/StyleSheets/author.css.metadata
  31. +7 −0 disk-collaborationtoday/Resources/StyleSheets/recaptcha.css
  32. +17 −0 disk-collaborationtoday/Resources/StyleSheets/recaptcha.css.metadata
  33. +7 −11 disk-collaborationtoday/XPages/about.xsp
  34. +14 −9 disk-collaborationtoday/XPages/about.xsp.metadata
  35. +12 −38 disk-collaborationtoday/XPages/add.xsp
  36. +9 −9 disk-collaborationtoday/XPages/add.xsp.metadata
  37. +3 −2 disk-collaborationtoday/XPages/admin.xsp
  38. +11 −11 disk-collaborationtoday/XPages/admin.xsp.metadata
  39. +116 −195 disk-collaborationtoday/XPages/author.xsp
  40. +10 −10 disk-collaborationtoday/XPages/author.xsp.metadata
  41. +8 −8 disk-collaborationtoday/XPages/authors.xsp
  42. +11 −11 disk-collaborationtoday/XPages/authors.xsp.metadata
  43. +70 −89 disk-collaborationtoday/XPages/contact.xsp
  44. +14 −9 disk-collaborationtoday/XPages/contact.xsp.metadata
  45. +0 −2  disk-collaborationtoday/XPages/feed.xsp
  46. +6 −19 disk-collaborationtoday/XPages/follow.xsp
  47. +6 −7 disk-collaborationtoday/XPages/mod.xsp
  48. +11 −11 disk-collaborationtoday/XPages/mod.xsp.metadata
  49. +7 −7 disk-collaborationtoday/XPages/modApproved.xsp
  50. +9 −9 disk-collaborationtoday/XPages/modApproved.xsp.metadata
  51. +4 −4 disk-collaborationtoday/XPages/modPopular.xsp
  52. +8 −8 disk-collaborationtoday/XPages/modPopular.xsp.metadata
  53. +4 −4 disk-collaborationtoday/XPages/modSpotlight.xsp
  54. +8 −8 disk-collaborationtoday/XPages/modSpotlight.xsp.metadata
  55. +7 −8 disk-collaborationtoday/XPages/modTopStories.xsp
  56. +8 −8 disk-collaborationtoday/XPages/modTopStories.xsp.metadata
  57. +4 −2 disk-collaborationtoday/XPages/moderateEntry.xsp
  58. +8 −8 disk-collaborationtoday/XPages/moderateEntry.xsp.metadata
  59. +1 −0  disk-collaborationtoday/XPages/moderateRequest.xsp
  60. +11 −11 disk-collaborationtoday/XPages/moderateRequest.xsp.metadata
  61. +3 −1 disk-collaborationtoday/XPages/mypicCrop.xsp
  62. +10 −10 disk-collaborationtoday/XPages/mypicCrop.xsp.metadata
  63. +5 −1 disk-collaborationtoday/XPages/mypicUploadFile.xsp
  64. +10 −10 disk-collaborationtoday/XPages/mypicUploadFile.xsp.metadata
  65. +3 −1 disk-collaborationtoday/XPages/mypicUploadInternet.xsp
  66. +7 −7 disk-collaborationtoday/XPages/mypicUploadInternet.xsp.metadata
  67. +1 −0  disk-collaborationtoday/XPages/requestsClosed.xsp
  68. +11 −11 disk-collaborationtoday/XPages/requestsClosed.xsp.metadata
  69. +1 −0  disk-collaborationtoday/XPages/requestsOpen.xsp
  70. +11 −11 disk-collaborationtoday/XPages/requestsOpen.xsp.metadata
View
5 disk-collaborationtoday/.settings/org.eclipse.core.resources.prefs
@@ -1,11 +1,14 @@
-#Sun Feb 17 15:04:35 EET 2013
+#Fri May 03 16:05:29 EDT 2013
encoding//Resources/StyleSheets/jquery.Jcrop.css=UTF-8
encoding//Resources/Files/TestWidget.html=UTF-8
encoding//Resources/Files/TestJSONP.html=UTF-8
encoding//Resources/StyleSheets/view.css=UTF-8
+encoding//Resources/StyleSheets/recaptcha.css=UTF-8
+encoding//Resources/StyleSheets/add.css=UTF-8
encoding//Resources/StyleSheets/mypic.css=UTF-8
eclipse.preferences.version=1
encoding//Resources/StyleSheets/pager.css=UTF-8
encoding//Resources/StyleSheets/collab2day.css=UTF-8
encoding//Resources/StyleSheets/bootstrap-2.0.4.combined.min.css=UTF-8
encoding//Resources/StyleSheets/custom.css=UTF-8
+encoding//Resources/StyleSheets/author.css=UTF-8
View
28 disk-collaborationtoday/Code/Java/controller/about.java
@@ -0,0 +1,28 @@
+package controller;
+
+import java.util.*;
+import frostillicus.controller.BasicXPageController;
+import org.openntf.news.http.core.Category;
+import org.openntf.news.http.core.Type;
+
+import static org.openntf.news.http.core.MiscUtils.getConfigCache;
+
+public class about extends BasicXPageController {
+ private static final long serialVersionUID = 1L;
+
+ public List<Type> getCategoryTypes() {
+ Category category = (Category)resolveVariable("category");
+ return getConfigCache().getTypesForCategory(category.getID());
+ }
+ public String getEntryModeratorsText() {
+ Type type = (Type)resolveVariable("entry");
+ // Geez, Java; would it kill you to have good string implosion?
+ StringBuilder result = new StringBuilder();
+ boolean appended = false;
+ for(String mod : type.getModerators()) {
+ if(appended) { result.append(", "); } else { appended = true; }
+ result.append(mod);
+ }
+ return result.toString();
+ }
+}
View
15 disk-collaborationtoday/Code/Java/controller/about.java.metadata
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="506" sequence="10" unid="F08411797B74C8F285257B6000673AB1">
+<created><datetime dst="true">20130503T144732,33-04</datetime></created>
+<modified><datetime dst="true">20130503T145157,66-04</datetime></modified>
+<revised><datetime dst="true">20130503T145157,64-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T145157,64-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T144732,36-04</datetime></addedtofile></noteinfo>
+<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
+<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
+<item name="$Flags"><text>34567Cg~[</text></item>
+<item name="$TITLE"><text>controller/about.java</text></item>
+<item name="$DesignerVersion"><text>8.5.3</text></item>
+
+
+<item name="$FileNames" sign="true"><text>controller/about.java</text></item></note>
View
29 disk-collaborationtoday/Code/Java/controller/add.java
@@ -0,0 +1,29 @@
+package controller;
+
+import java.util.*;
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
+import javax.faces.event.PhaseEvent;
+import javax.servlet.http.HttpServletResponse;
+import org.openntf.news.http.core.Parser;
+import frostillicus.controller.BasicXPageController;
+
+public class add extends BasicXPageController {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void beforeRenderResponse(PhaseEvent event) throws Exception {
+ super.beforeRenderResponse(event);
+
+ ExternalContext exCon = FacesContext.getCurrentInstance().getExternalContext();
+
+ HttpServletResponse response = (HttpServletResponse)exCon.getResponse();
+ response.setHeader("Cache-Control", "no-cache");
+ }
+
+ public void parseURL() {
+ Map<String, Object> viewScope = getViewScope();
+ String resultUNID = Parser.getOutput((String)viewScope.get("addingURL"));
+ viewScope.put("parsedDocUNID", resultUNID);
+ }
+}
View
15 disk-collaborationtoday/Code/Java/controller/add.java.metadata
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="50a" sequence="6" unid="E79BB42A1021457E85257B6000688A85">
+<created><datetime dst="true">20130503T150152,05-04</datetime></created>
+<modified><datetime dst="true">20130503T150204,35-04</datetime></modified>
+<revised><datetime dst="true">20130503T150204,33-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T150204,33-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T150152,09-04</datetime></addedtofile></noteinfo>
+<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
+<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
+<item name="$Flags"><text>34567Cg~[</text></item>
+<item name="$TITLE"><text>controller/add.java</text></item>
+<item name="$DesignerVersion"><text>8.5.3</text></item>
+
+
+<item name="$FileNames" sign="true"><text>controller/add.java</text></item></note>
View
93 disk-collaborationtoday/Code/Java/controller/author.java
@@ -0,0 +1,93 @@
+package controller;
+
+import lotus.domino.*;
+import java.util.*;
+import com.ibm.xsp.model.domino.wrapped.DominoDocument;
+import org.openntf.news.http.core.Person;
+import frostillicus.controller.BasicXPageController;
+
+import static org.openntf.news.http.core.MiscUtils.*;
+
+public class author extends BasicXPageController {
+ private static final long serialVersionUID = 1L;
+
+ // TODO figure out why I can't call this directly as querySaveDocument="#{pageController.querySaveDocument}" - wrong params?
+ public boolean querySaveDocument() throws Exception {
+ DominoDocument doc = (DominoDocument)resolveVariable("currentDocument");
+
+ if(!doc.isNewNote()) { return true; }
+
+ String pid = sanitizeNameForID(doc.getItemValueString("PDisplayName"));
+ Person person = getPersonsCache().getPerson(pid);
+
+ return person.getDisplayName().isEmpty();
+ }
+
+ public void processNewDoc() throws Exception {
+ DominoDocument doc = (DominoDocument)resolveVariable("currentDocument");
+
+ doc.replaceItemValue("PCreationDate", new Date());
+
+ String pid = sanitizeNameForID(doc.getItemValueString("PDisplayName"));
+ doc.replaceItemValue("PID", pid);
+ }
+
+ public boolean isNewNote() throws NotesException {
+ return ((DominoDocument)resolveVariable("currentDocument")).isNewNote();
+ }
+ public String getUniversalID() throws NotesException {
+ return ((DominoDocument)resolveVariable("currentDocument")).getDocument().getUniversalID();
+ }
+
+ public void chooseMypic() throws NotesException {
+ DominoDocument doc = (DominoDocument)resolveVariable("document1");
+ doc.replaceItemValue("currentMypic", resolveVariable("name"));
+ doc.save();
+ }
+ @SuppressWarnings("unchecked")
+ public void deleteMypic() throws NotesException {
+ /*
+ * var mypic = document11.getDocument(true)
+ var rtItem:NotesRichTextItem = mypic.getFirstItem('mypics')
+ var image:NotesEmbeddedObject = rtItem.getEmbeddedObject(name)
+ image.remove()
+ var mypicNames = mypic.getFirstItem('mypicNames')
+ var rVals = mypicNames.getValues()
+ rVals.remove(name)
+ mypicNames.setValues(rVals)
+ if (mypic.getItemValueString('currentMypic') == name) {
+ if (mypicNames.getValues() == null) {
+ mypic.replaceItemValue('currentMypic', '')
+ } else {
+ mypic.replaceItemValue('currentMypic', mypicNames.getValues().get(0))
+ }
+ }
+ document11.save()
+ */
+
+ DominoDocument doc = (DominoDocument)resolveVariable("document1");
+ String name = (String)resolveVariable("name");
+
+ Document mypic = doc.getDocument(true);
+ RichTextItem rtItem = (RichTextItem)mypic.getFirstItem("mypics");
+ EmbeddedObject image = rtItem.getEmbeddedObject(name);
+ image.remove();
+
+ List<String> names = mypic.getItemValue("mypicNames");
+ names.remove(name);
+ mypic.replaceItemValue("mypicNames", names);
+
+ if(name.equals(mypic.getItemValueString("currentMypic"))) {
+ if(names.size() == 0) {
+ mypic.replaceItemValue("currentMypic", "");
+ } else {
+ mypic.replaceItemValue("currentMypic", names.get(0));
+ }
+ }
+ doc.save();
+ }
+
+ private String sanitizeNameForID(final String name) {
+ return name == null ? "" : name.replaceAll("\\s", "").replaceAll("\\W", "").toLowerCase();
+ }
+}
View
15 disk-collaborationtoday/Code/Java/controller/author.java.metadata
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="53a" sequence="12" unid="89BEF346F4EAC6CD85257B60006E7EF1">
+<created><datetime dst="true">20130503T160654,57-04</datetime></created>
+<modified><datetime dst="true">20130503T160944,40-04</datetime></modified>
+<revised><datetime dst="true">20130503T160944,38-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T160944,38-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T160654,60-04</datetime></addedtofile></noteinfo>
+<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
+<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
+<item name="$Flags"><text>34567Cg~[</text></item>
+<item name="$TITLE"><text>controller/author.java</text></item>
+<item name="$DesignerVersion"><text>8.5.3</text></item>
+
+
+<item name="$FileNames" sign="true"><text>controller/author.java</text></item></note>
View
19 disk-collaborationtoday/Code/Java/controller/contact.java
@@ -0,0 +1,19 @@
+package controller;
+
+import java.util.Date;
+import com.ibm.xsp.model.domino.wrapped.DominoDocument;
+import lotus.domino.*;
+import frostillicus.controller.BasicXPageController;
+
+public class contact extends BasicXPageController {
+ private static final long serialVersionUID = 1L;
+
+ public void querySaveRequest() throws NotesException {
+ Session session = (Session)resolveVariable("session");
+ DominoDocument doc = (DominoDocument)resolveVariable("document1");
+ DateTime now = session.createDateTime(new Date());
+ doc.replaceItemValue("RCreationDate", now);
+ doc.replaceItemValue("RState", "open");
+ now.recycle();
+ }
+}
View
15 disk-collaborationtoday/Code/Java/controller/contact.java.metadata
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="4f6" sequence="6" unid="1EA6DB509BBC949F85257B600065F384">
+<created><datetime dst="true">20130503T143334,76-04</datetime></created>
+<modified><datetime dst="true">20130503T143644,70-04</datetime></modified>
+<revised><datetime dst="true">20130503T143644,68-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T143644,68-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T143334,79-04</datetime></addedtofile></noteinfo>
+<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
+<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
+<item name="$Flags"><text>34567Cg~[</text></item>
+<item name="$TITLE"><text>controller/contact.java</text></item>
+<item name="$DesignerVersion"><text>8.5.3</text></item>
+
+
+<item name="$FileNames" sign="true"><text>controller/contact.java</text></item></note>
View
1  disk-collaborationtoday/Code/Java/controller/follow.java
@@ -8,7 +8,6 @@
public class follow extends BasicXPageController {
private static final long serialVersionUID = 1L;
- //configCache.getCategory(type.getCategoryId()).getDisplayName()
public String getTypeCategoryName() {
Type type = (Type)resolveVariable("type");
return getConfigCache().getCategory(type.getCategoryId()).getDisplayName();
View
16 disk-collaborationtoday/Code/Java/controller/mod.java
@@ -0,0 +1,16 @@
+package controller;
+
+import com.ibm.xsp.model.domino.wrapped.DominoViewEntry;
+import org.openntf.news.http.core.Person;
+import frostillicus.controller.BasicXPageController;
+
+import static org.openntf.news.http.core.MiscUtils.*;
+
+public class mod extends BasicXPageController {
+ private static final long serialVersionUID = 1L;
+
+ public Person getEntryPerson() {
+ DominoViewEntry entry = (DominoViewEntry)resolveVariable("entry");
+ return getPersonsCache().getPerson((String)entry.getColumnValue("PID"));
+ }
+}
View
15 disk-collaborationtoday/Code/Java/controller/mod.java.metadata
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="522" sequence="4" unid="171D657C385E397A85257B60006ADD7B">
+<created><datetime dst="true">20130503T152715,15-04</datetime></created>
+<modified><datetime dst="true">20130503T152824,85-04</datetime></modified>
+<revised><datetime dst="true">20130503T152824,84-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T152824,84-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T152715,18-04</datetime></addedtofile></noteinfo>
+<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
+<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
+<item name="$Flags"><text>34567Cg~[</text></item>
+<item name="$TITLE"><text>controller/mod.java</text></item>
+<item name="$DesignerVersion"><text>8.5.3</text></item>
+
+
+<item name="$FileNames" sign="true"><text>controller/mod.java</text></item></note>
View
17 disk-collaborationtoday/Code/Java/controller/modApproved.java
@@ -0,0 +1,17 @@
+package controller;
+
+import frostillicus.controller.BasicXPageController;
+import org.openntf.news.http.core.Person;
+
+import com.ibm.xsp.model.domino.wrapped.DominoViewEntry;
+
+import static org.openntf.news.http.core.MiscUtils.*;
+
+public class modApproved extends BasicXPageController {
+ private static final long serialVersionUID = 1L;
+
+ public Person getEntryPerson() {
+ DominoViewEntry entry = (DominoViewEntry)resolveVariable("entry");
+ return getPersonsCache().getPerson((String)entry.getColumnValue("PID"));
+ }
+}
View
16 disk-collaborationtoday/Code/Java/controller/modApproved.java.metadata
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="532" sequence="5" unid="2FAA6DDC88D97A0B85257B60006DC641">
+<created><datetime dst="true">20130503T155901,77-04</datetime></created>
+<modified><datetime dst="true">20130503T155907,57-04</datetime></modified>
+<revised><datetime dst="true">20130503T155907,56-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T155907,56-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T155901,82-04</datetime></addedtofile></noteinfo>
+<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
+<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
+<item name="$Flags"><text>34567Cg~[</text></item>
+
+<item name="$TITLE"><text>controller/modApproved.java</text></item>
+<item name="$DesignerVersion"><text>8.5.3</text></item>
+
+
+<item name="$FileNames" sign="true"><text>controller/modApproved.java</text></item></note>
View
16 disk-collaborationtoday/Code/Java/controller/modPopular.java
@@ -0,0 +1,16 @@
+package controller;
+
+import frostillicus.controller.BasicXPageController;
+import org.openntf.news.http.core.NewsEntry;
+import org.openntf.news.http.core.Person;
+
+import static org.openntf.news.http.core.MiscUtils.*;
+
+public class modPopular extends BasicXPageController {
+ private static final long serialVersionUID = 1L;
+
+ public Person getEntryPerson() {
+ NewsEntry entry = (NewsEntry)resolveVariable("entry");
+ return getPersonsCache().getPerson(entry.getPID());
+ }
+}
View
16 disk-collaborationtoday/Code/Java/controller/modPopular.java.metadata
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="52e" sequence="7" unid="35F1DCDA9CF02F3485257B60006DA93D">
+<created><datetime dst="true">20130503T155747,49-04</datetime></created>
+<modified><datetime dst="true">20130503T155806,41-04</datetime></modified>
+<revised><datetime dst="true">20130503T155806,39-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T155806,39-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T155747,55-04</datetime></addedtofile></noteinfo>
+<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
+<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
+<item name="$Flags"><text>34567Cg~[</text></item>
+
+<item name="$TITLE"><text>controller/modPopular.java</text></item>
+<item name="$DesignerVersion"><text>8.5.3</text></item>
+
+
+<item name="$FileNames" sign="true"><text>controller/modPopular.java</text></item></note>
View
24 disk-collaborationtoday/Code/Java/controller/modSpotlight.java
@@ -0,0 +1,24 @@
+package controller;
+
+import lotus.domino.*;
+import frostillicus.controller.BasicXPageController;
+import org.openntf.news.http.core.NewsEntry;
+import org.openntf.news.http.core.Person;
+
+import static org.openntf.news.http.core.MiscUtils.*;
+
+public class modSpotlight extends BasicXPageController {
+ private static final long serialVersionUID = 1L;
+
+ public boolean isCurrentUserSpotlightMod() throws NotesException {
+ Session session = (Session)resolveVariable("session");
+ String userName = session.getEffectiveUserName();
+
+ return getConfigCache().isUserSpotlightModerator(userName);
+ }
+
+ public Person getEntryPerson() {
+ NewsEntry entry = (NewsEntry)resolveVariable("entry");
+ return getPersonsCache().getPerson(entry.getPID());
+ }
+}
View
16 disk-collaborationtoday/Code/Java/controller/modSpotlight.java.metadata
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="52a" sequence="9" unid="95CAE817FAA492E685257B60006D0F8F">
+<created><datetime dst="true">20130503T155114,07-04</datetime></created>
+<modified><datetime dst="true">20130503T155457,51-04</datetime></modified>
+<revised><datetime dst="true">20130503T155457,49-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T155457,49-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T155114,17-04</datetime></addedtofile></noteinfo>
+<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
+<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
+<item name="$Flags"><text>34567Cg~[</text></item>
+
+<item name="$TITLE"><text>controller/modSpotlight.java</text></item>
+<item name="$DesignerVersion"><text>8.5.3</text></item>
+
+
+<item name="$FileNames" sign="true"><text>controller/modSpotlight.java</text></item></note>
View
35 disk-collaborationtoday/Code/Java/controller/modTopStories.java
@@ -0,0 +1,35 @@
+package controller;
+
+import java.util.*;
+import lotus.domino.*;
+import frostillicus.controller.BasicXPageController;
+import org.openntf.news.http.core.Category;
+import org.openntf.news.http.core.NewsEntry;
+import org.openntf.news.http.core.Person;
+
+import static org.openntf.news.http.core.MiscUtils.*;
+
+public class modTopStories extends BasicXPageController {
+ private static final long serialVersionUID = 1L;
+
+ public boolean isCurrentUserTopStoriesMod() throws NotesException {
+ Session session = (Session)resolveVariable("session");
+ String userName = session.getEffectiveUserName();
+
+ return getConfigCache().isUserTopStoriesModerator(userName);
+ }
+
+ public Person getTopStoryPerson() {
+ NewsEntry entry = (NewsEntry)resolveVariable("entryMTT");
+ return getPersonsCache().getPerson(entry.getPID());
+ }
+
+ public List<NewsEntry> getCategoryTopStories() {
+ Category category = (Category)resolveVariable("category");
+ return getNewsCache().getTopStories(category.getID());
+ }
+ public Person getCategoryStoryPerson() {
+ NewsEntry entry = (NewsEntry)resolveVariable("entryMTC");
+ return getPersonsCache().getPerson(entry.getPID());
+ }
+}
View
15 disk-collaborationtoday/Code/Java/controller/modTopStories.java.metadata
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="526" sequence="5" unid="A3D8C497DFA1053C85257B60006B4045">
+<created><datetime dst="true">20130503T153128,05-04</datetime></created>
+<modified><datetime dst="true">20130503T153241,36-04</datetime></modified>
+<revised><datetime dst="true">20130503T153241,34-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T153241,34-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T153128,08-04</datetime></addedtofile></noteinfo>
+<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
+<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
+<item name="$Flags"><text>34567Cg~[</text></item>
+<item name="$TITLE"><text>controller/modTopStories.java</text></item>
+<item name="$DesignerVersion"><text>8.5.3</text></item>
+
+
+<item name="$FileNames" sign="true"><text>controller/modTopStories.java</text></item></note>
View
14 disk-collaborationtoday/CustomControls/bsControlGroup.xsp
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xp:view xmlns:xp="http://www.ibm.com/xsp/core">
+ <div class="control-group">
+ <xp:label styleClass="control-label" value="#{compositeData.label}">
+ <xp:this.for><![CDATA[#{javascript:
+ var children = getComponent("controls").children
+ children.length < 1 ? "" : children[0].id
+ }]]></xp:this.for>
+ </xp:label>
+ <div class="controls">
+ <xp:callback id="controls"/>
+ </div>
+ </div>
+</xp:view>
View
21 disk-collaborationtoday/CustomControls/bsControlGroup.xsp-config
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config>
+ <faces-config-extension>
+ <namespace-uri>http://www.ibm.com/xsp/custom</namespace-uri>
+ <default-prefix>xc</default-prefix>
+ </faces-config-extension>
+ <composite-component>
+ <component-type>bsControlGroup</component-type>
+ <composite-name>bsControlGroup</composite-name>
+ <composite-file>/bsControlGroup.xsp</composite-file>
+ <composite-extension>
+ <designer-extension>
+ <in-palette>true</in-palette>
+ </designer-extension>
+ </composite-extension>
+ <property>
+ <property-name>label</property-name>
+ <property-class>string</property-class>
+ </property>
+ </composite-component>
+</faces-config>
View
16 disk-collaborationtoday/CustomControls/bsControlGroup.xsp.metadata
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="53e" sequence="6" unid="426752FCAF87BC1D85257B60006FAD57">
+<created><datetime dst="true">20130503T161948,71-04</datetime></created>
+<modified><datetime dst="true">20130503T162132,46-04</datetime></modified>
+<revised><datetime dst="true">20130503T162132,44-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T162132,44-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T161948,74-04</datetime></addedtofile></noteinfo>
+<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
+<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
+<item name="$Flags"><text>gC~4;</text></item>
+<item name="$TITLE"><text>bsControlGroup.xsp</text></item>
+
+
+
+
+<item name="$FileNames" sign="true"><text>bsControlGroup.xsp</text></item></note>
View
242 disk-collaborationtoday/CustomControls/moderationNewsEntry.xsp
@@ -1,185 +1,87 @@
<?xml version="1.0" encoding="UTF-8"?>
<xp:view xmlns:xp="http://www.ibm.com/xsp/core">
- <xp:table>
- <xp:tr>
- <xp:td>
+ <table>
+ <tr>
+ <td>
<xp:button value="Edit" id="button1" styleClass="btn">
- <xp:eventHandler event="onclick" submit="true"
- refreshMode="complete">
- <xp:this.action><![CDATA[#{javascript:var exCon = facesContext.getExternalContext();
- var writer = facesContext.getResponseWriter();
-var response = exCon.getResponse();
-var output = "moderateEntry.xsp?nid=" + compositeData.nID;
-response.sendRedirect(output);}]]></xp:this.action>
+ <xp:eventHandler event="onclick" submit="true" refreshMode="complete">
+ <xp:this.action><![CDATA[#{javascript:
+ var exCon = facesContext.getExternalContext();
+ var writer = facesContext.getResponseWriter();
+ var response = exCon.getResponse();
+ var output = "moderateEntry.xsp?nid=" + compositeData.nID;
+ response.sendRedirect(output);
+ }]]></xp:this.action>
</xp:eventHandler>
</xp:button>
- </xp:td>
- <!--
- <xp:td>
- <xp:button value="Delete" id="button2" styleClass="btn">
- <xp:eventHandler event="onclick" submit="true"
- refreshMode="complete">
- <xp:this.action>
- <xp:actionGroup>
- <xp:confirm message="Are you sure to delete the entry?">
- </xp:confirm>
- <xp:executeScript>
- <xp:this.script><![CDATA[#{javascript:var id = compositeData.nID;
- if(id!=null && id!=""){
- var view1 = database.getView("NewsAllByID");
- var entry = view1.getEntryByKey(id, true);
- if (entry != null) {
- var unid = entry.getUniversalID();
- var doc = database.getDocumentByUNID(unid);
- if (doc != null) {
- doc.remove(true);
- newsCache.update();
- context.redirectToPage("mod.xsp");
- }
- }
- } else {
- }}]]></xp:this.script>
- </xp:executeScript>
- </xp:actionGroup>
- </xp:this.action>
+ </td>
+ <!-- In my defense, without the "== true", an absentboolean property is treated as true for some reason -->
+ <xp:td rendered="#{compositeData.showRemoveTopStoryButton == true}">
+ <xp:button value="Remove" id="button2" styleClass="btn">
+ <xp:eventHandler event="onclick" submit="true" refreshMode="complete">
+ <xp:this.action><![CDATA[#{javascript:
+ var id = compositeData.nID;
+ if(id != null && id != ""){
+ var view1 = database.getView("NewsAllByID");
+ var entry = view1.getEntryByKey(id, true);
+ if (entry != null) {
+ var unid = entry.getUniversalID();
+ var doc = database.getDocumentByUNID(unid);
+ if (doc != null) {
+ doc.replaceItemValue("NTopStory", "no");
+ doc.replaceItemValue("NHistory", doc.getItemValueString("NHistory") + @UserName() + " " + new Date() + "\n" +"Top Story: no" + "\n\n");
+ doc.save(true);
+ newsCache.update();
+ context.redirectToPage("modTopStories.xsp");
+ }
+ }
+ }
+ }]]></xp:this.action>
</xp:eventHandler>
</xp:button>
</xp:td>
- -->
- <xp:td>
- <xp:this.rendered><![CDATA[#{javascript:if (compositeData.showRemoveTopStoryButton == null) return false;
-if (!compositeData.showRemoveTopStoryButton.equalsIgnoreCase("yes")) return false;
-return true;}]]></xp:this.rendered>
- <xp:button value="Remove" id="button2"
- styleClass="btn">
- <xp:eventHandler event="onclick" submit="true"
- refreshMode="complete">
- <xp:this.action>
- <xp:actionGroup>
- <xp:executeScript>
- <xp:this.script><![CDATA[#{javascript:var id = compositeData.nID;
- if(id!=null && id!=""){
- var view1 = database.getView("NewsAllByID");
- var entry = view1.getEntryByKey(id, true);
- if (entry != null) {
- var unid = entry.getUniversalID();
- var doc = database.getDocumentByUNID(unid);
- if (doc != null) {
- doc.replaceItemValue("NTopStory", "no");
- doc.replaceItemValue("NHistory", doc.getItemValueString("NHistory") + @UserName() + " " + new Date() + "\n" +"Top Story: no" + "\n\n");
- doc.save(true);
- newsCache.update();
- context.redirectToPage("modTopStories.xsp");
- }
- }
- } else {
- }}]]></xp:this.script>
- </xp:executeScript>
- </xp:actionGroup>
- </xp:this.action>
+ <xp:td rendered="#{compositeData.showRemoveSpotlightButton == true}">
+ <xp:button value="Remove" id="button3" styleClass="btn">
+ <xp:eventHandler event="onclick" submit="true" refreshMode="complete">
+ <xp:this.action><![CDATA[#{javascript:
+ var id = compositeData.nID;
+ if(id != null && id != ""){
+ var view1 = database.getView("NewsAllByID");
+ var entry = view1.getEntryByKey(id, true);
+ if (entry != null) {
+ var unid = entry.getUniversalID();
+ var doc = database.getDocumentByUNID(unid);
+ if (doc != null) {
+ doc.replaceItemValue("NSpotlight", "no");
+ doc.replaceItemValue("NHistory", doc.getItemValueString("NHistory") + @UserName() + " " + new Date() + "\n" +"Spotlight: no" + "\n\n");
+ doc.save(true);
+ newsCache.update();
+ context.redirectToPage("modSpotlight.xsp");
+ }
+ }
+ }
+ }]]></xp:this.action>
</xp:eventHandler>
</xp:button>
</xp:td>
- <xp:td>
- <xp:this.rendered><![CDATA[#{javascript:if (compositeData.showRemoveSpotlightButton == null) return false;
-if (!compositeData.showRemoveSpotlightButton.equalsIgnoreCase("yes")) return false;
-return true;}]]></xp:this.rendered>
- <xp:button value="Remove" id="button3"
- styleClass="btn">
- <xp:eventHandler event="onclick" submit="true"
- refreshMode="complete">
- <xp:this.action>
- <xp:actionGroup>
- <xp:executeScript>
- <xp:this.script><![CDATA[#{javascript:var id = compositeData.nID;
- if(id!=null && id!=""){
- var view1 = database.getView("NewsAllByID");
- var entry = view1.getEntryByKey(id, true);
- if (entry != null) {
- var unid = entry.getUniversalID();
- var doc = database.getDocumentByUNID(unid);
- if (doc != null) {
- doc.replaceItemValue("NSpotlight", "no");
- doc.replaceItemValue("NHistory", doc.getItemValueString("NHistory") + @UserName() + " " + new Date() + "\n" +"Spotlight: no" + "\n\n");
- doc.save(true);
- newsCache.update();
- context.redirectToPage("modSpotlight.xsp");
- }
- }
- } else {
- }}]]></xp:this.script>
- </xp:executeScript>
- </xp:actionGroup>
- </xp:this.action>
- </xp:eventHandler>
- </xp:button>
- </xp:td>
- <!--
- <xp:repeat id="repeat1" rows="30"
- value="#{javascript:configCache.getTypesForCurrentUser()}"
- var="index">
- <xp:this.rendered><![CDATA[#{javascript:compositeData.state != "approved"}]]></xp:this.rendered>
- <xp:td>
- <xp:button
- value="#{javascript:index.getDisplayName()}" id="adsf">
- <xp:eventHandler event="onclick" submit="true"
- refreshMode="complete">
- <xp:this.action><![CDATA[#{javascript:var id = compositeData.nID;
- if(id!=null && id!=""){
- var view1 = database.getView("NewsAllByID");
- var entry = view1.getEntryByKey(id, true);
- if (entry != null) {
- var unid = entry.getUniversalID();
- var doc = database.getDocumentByUNID(unid);
- if (doc != null) {
- doc.replaceItemValue("NState", "approved");
- var dateNow = new java.util.Date();
- doc.replaceItemValue("NModerationDate", session.createDateTime(dateNow));
- doc.replaceItemValue("TID", index.getID());
- doc.save(true);
- context.redirectToPage("mod.xsp");
- }
- }
- } else {
- }}]]></xp:this.action>
- </xp:eventHandler></xp:button>
- </xp:td>
- </xp:repeat>
- -->
- <xp:td style="padding-left:5.0px">
- <xp:link value="#{javascript:compositeData.link}" target="_blank" text="#{javascript:compositeData.title}">
- </xp:link>
+ <td style="padding-left:5.0px">
+ <xp:link value="#{compositeData.link}" target="_blank" text="#{compositeData.title}"/>
<br></br>
- <xp:label value="#{javascript:compositeData.personDisplayName}">
- </xp:label>
- <xp:label value=" - Published: ">
- </xp:label>
- <xp:label value="#{javascript:compositeData.publicationDate}">
- </xp:label>
- <xp:panel>
- <xp:this.rendered><![CDATA[#{javascript:if (compositeData.creationDate == null) {
- return false;
-} else {return true;}}]]></xp:this.rendered>
- <xp:label value=" - Created: ">
- </xp:label>
- <xp:label value="#{javascript:compositeData.creationDate}">
- </xp:label>
+ <xp:label value="#{compositeData.personDisplayName}"/>
+ <xp:label value=" - Published: "/>
+ <xp:label value="#{compositeData.publicationDate}"/>
+ <xp:panel rendered="#{compositeData.creationDate != null}">
+ <xp:label value=" - Created: "/>
+ <xp:label value="#{compositeData.creationDate}"/>
</xp:panel>
- <xp:panel>
- <xp:this.rendered><![CDATA[#{javascript:if (compositeData.clicksTotal == null) {
- return false;
-} else {return true;}}]]></xp:this.rendered>
- <xp:label value=" - Clicks: "></xp:label>
- <xp:label
- value="#{javascript:compositeData.clicksTotal}">
- </xp:label>
- <xp:label value=" - Last Week Clicks: "></xp:label>
- <xp:label
- value="#{javascript:compositeData.clicksLastWeek}">
- </xp:label>
+ <xp:panel rendered="#{compositeData.clicksTotal != null}">
+ <xp:label value=" - Clicks: "/>
+ <xp:label value="#{compositeData.clicksTotal}"/>
+ <xp:label value=" - Last Week Clicks: "/>
+ <xp:label value="#{compositeData.clicksLastWeek}"/>
</xp:panel>
- </xp:td>
- </xp:tr>
- </xp:table>
- <xp:br></xp:br>
+ </td>
+ </tr>
+ </table>
+ <br />
</xp:view>
View
14 disk-collaborationtoday/CustomControls/moderationNewsEntry.xsp-config
@@ -51,11 +51,21 @@
</property>
<property>
<property-name>showRemoveTopStoryButton</property-name>
- <property-class>string</property-class>
+ <property-class>boolean</property-class>
+ <property-extension>
+ <designer-extension>
+ <default-value>false</default-value>
+ </designer-extension>
+ </property-extension>
</property>
<property>
<property-name>showRemoveSpotlightButton</property-name>
- <property-class>string</property-class>
+ <property-class>boolean</property-class>
+ <property-extension>
+ <designer-extension>
+ <default-value>false</default-value>
+ </designer-extension>
+ </property-extension>
</property>
</composite-component>
</faces-config>
View
23 disk-collaborationtoday/CustomControls/moderationNewsEntry.xsp.metadata
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?><note class="form" maintenanceversion="3.0" replicaid="85257AA6004F5595" version="8.5" xmlns="http://www.lotus.com/dxl">
-<noteinfo noteid="2ae" sequence="4" unid="C4710F62168271DB85257AA6004F6D11">
-<created><datetime dst="true">20121029T102732,65-04</datetime></created>
-<modified><datetime dst="true">20121029T102733,13-04</datetime></modified>
-<revised><datetime dst="true">20121029T102733,12-04</datetime></revised>
-<lastaccessed><datetime dst="true">20121029T102733,12-04</datetime></lastaccessed>
-<addedtofile><datetime dst="true">20121029T102732,73-04</datetime></addedtofile></noteinfo>
-<updatedby><name>CN=Jesse Gallagher/O=MTC</name></updatedby>
-<wassignedby><name>CN=Jesse Gallagher/O=MTC</name></wassignedby>
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="2f2" sequence="21" unid="CADC866EA5F62A7A85257B60005FAF66">
+<created><datetime dst="true">20130503T132508,22-04</datetime></created>
+<modified><datetime dst="true">20130503T154617,76-04</datetime></modified>
+<revised><datetime dst="true">20130503T154617,74-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T154617,74-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T132508,25-04</datetime></addedtofile></noteinfo>
+<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
+<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
<item name="$Flags"><text>gC~4;</text></item>
<item name="$TITLE" sign="true"><text>moderationNewsEntry.xsp</text></item>
<item name="$DesignerVersion"><text>8.5</text></item>
@@ -14,4 +14,9 @@
+
+
+
+
+
<item name="$FileNames" sign="true"><text>moderationNewsEntry.xsp</text></item></note>
View
18 disk-collaborationtoday/Resources/StyleSheets/add.css
@@ -0,0 +1,18 @@
+.lotusTitleBar h2.lotusEllipsis {
+ width: 380px;
+}
+.xspPagerRight {
+ color: #848484;
+ float: left;
+}
+
+.busyShown {
+ background-image: url("Loading.gif");
+ background-repeat: no-repeat;
+ height: 32px;
+ position: relative;
+ width: 32px;
+}
+.busyHidden {
+ display:none;
+}
View
17 disk-collaborationtoday/Resources/StyleSheets/add.css.metadata
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="50e" sequence="5" unid="F342EA21798FFB8285257B6000689D1F">
+<created><datetime dst="true">20130503T150239,67-04</datetime></created>
+<modified><datetime dst="true">20130503T150323,86-04</datetime></modified>
+<revised><datetime dst="true">20130503T150323,84-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T150323,84-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T150239,71-04</datetime></addedtofile></noteinfo>
+<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
+<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
+<item name="$TITLE"><text>add.css</text></item>
+<item name="$MimeType"><text>text/css</text></item>
+<item name="$Flags"><text>34C=Q</text></item>
+<item name="$MimeCharSet"><text>UTF-8</text></item>
+<item name="$DesignerVersion"><text>8.5.3</text></item>
+
+
+<item name="$FileNames" sign="true"><text>add.css</text></item></note>
View
7 disk-collaborationtoday/Resources/StyleSheets/author.css
@@ -0,0 +1,7 @@
+.lotusTitleBar h2.lotusEllipsis {
+ width: 380px;
+}
+.xspPagerRight {
+ color: #848484;
+ float: left;
+}
View
17 disk-collaborationtoday/Resources/StyleSheets/author.css.metadata
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="536" sequence="4" unid="5F8EF98E4D42006185257B60006E5D7B">
+<created><datetime dst="true">20130503T160528,91-04</datetime></created>
+<modified><datetime dst="true">20130503T160546,02-04</datetime></modified>
+<revised><datetime dst="true">20130503T160546,01-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T160546,01-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T160528,94-04</datetime></addedtofile></noteinfo>
+<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
+<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
+<item name="$TITLE"><text>author.css</text></item>
+<item name="$MimeType"><text>text/css</text></item>
+<item name="$Flags"><text>34C=Q</text></item>
+<item name="$MimeCharSet"><text>UTF-8</text></item>
+<item name="$DesignerVersion"><text>8.5.3</text></item>
+
+
+<item name="$FileNames" sign="true"><text>author.css</text></item></note>
View
7 disk-collaborationtoday/Resources/StyleSheets/recaptcha.css
@@ -0,0 +1,7 @@
+#recaptcha_response_field {
+ left: 35px !important;
+ width: 130px !important;
+}
+#rc_enter_image, #rc_enter_audio {
+ left: 36px !important;
+}
View
17 disk-collaborationtoday/Resources/StyleSheets/recaptcha.css.metadata
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="502" sequence="5" unid="18955EBE291FEC6585257B600066F3A3">
+<created><datetime dst="true">20130503T144430,43-04</datetime></created>
+<modified><datetime dst="true">20130503T144546,97-04</datetime></modified>
+<revised><datetime dst="true">20130503T144546,95-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T144546,95-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T144430,46-04</datetime></addedtofile></noteinfo>
+<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
+<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
+<item name="$TITLE"><text>recaptcha.css</text></item>
+<item name="$MimeType"><text>text/css</text></item>
+<item name="$Flags"><text>34C=Q</text></item>
+<item name="$MimeCharSet"><text>UTF-8</text></item>
+<item name="$DesignerVersion"><text>8.5.3</text></item>
+
+
+<item name="$FileNames" sign="true"><text>recaptcha.css</text></item></note>
View
18 disk-collaborationtoday/XPages/about.xsp
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xp:view xmlns:xp="http://www.ibm.com/xsp/core" xmlns:xc="http://www.ibm.com/xsp/custom" pageTitle="About | Collaboration Today">
+<xp:view xmlns:xp="http://www.ibm.com/xsp/core" xmlns:xc="http://www.ibm.com/xsp/custom"
+ beforePageLoad="#{pageController.beforePageLoad}" afterPageLoad="#{pageController.afterPageLoad}"
+ pageTitle="About | Collaboration Today">
<xc:layout>
<xp:this.facets>
@@ -57,23 +59,17 @@
</p>
<p>Each category has different content&#160;moderators. Below is a list of the current moderators.</p>
<xp:repeat rows="30" value="${configCache.categories}" indexVar="index2" var="category">
- <xp:panel>
+ <div>
<span class="label">
<xp:text value="#{category.displayName}"/>
</span>
&#160;
<br />
<br />
- </xp:panel>
- <xp:repeat rows="30" value="#{javascript:configCache.getTypesForCategory(category.getID())}" indexVar="index" var="entry">
+ </div>
+ <xp:repeat rows="30" value="#{pageController.categoryTypes}" indexVar="index" var="entry">
<xp:panel>
- <xp:text value="#{entry.displayName}: "/>
- <xp:text>
- <xp:this.value><![CDATA[#{javascript:
- var moderators = entry.getModerators();
- moderators == null ? "" : @Implode(moderators, ", ")
- }]]></xp:this.value>
- </xp:text>
+ <xp:text value="#{entry.displayName}: #{pageController.entryModeratorsText}"/>
<br />
</xp:panel>
</xp:repeat>
View
23 disk-collaborationtoday/XPages/about.xsp.metadata
@@ -1,15 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?><note class="form" maintenanceversion="3.0" replicaid="85257AA6004F5595" version="8.5" xmlns="http://www.lotus.com/dxl">
-<noteinfo noteid="1c2" sequence="3" unid="C4A37F26AC402CA085257AA6004F5D8D">
-<created><datetime dst="true">20121029T102652,93-04</datetime></created>
-<modified><datetime dst="true">20121029T102653,31-04</datetime></modified>
-<revised><datetime dst="true">20121029T102653,30-04</datetime></revised>
-<lastaccessed><datetime dst="true">20121029T102653,30-04</datetime></lastaccessed>
-<addedtofile><datetime dst="true">20121029T102653,03-04</datetime></addedtofile></noteinfo>
-<updatedby><name>CN=Jesse Gallagher/O=MTC</name></updatedby>
-<wassignedby><name>CN=Jesse Gallagher/O=MTC</name></wassignedby>
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="1ca" sequence="9" unid="A872C3A1BAEE507A85257B60005F9D78">
+<created><datetime dst="true">20130503T132422,32-04</datetime></created>
+<modified><datetime dst="true">20130503T145152,63-04</datetime></modified>
+<revised><datetime dst="true">20130503T145152,61-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T145152,61-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T132422,37-04</datetime></addedtofile></noteinfo>
+<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
+<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
<item name="$Flags"><text>gC~4K</text></item>
<item name="$TITLE" sign="true"><text>about.xsp</text></item>
<item name="$DesignerVersion"><text>8.5</text></item>
+
+
+
+
+
<item name="$FileNames" sign="true"><text>about.xsp</text></item></note>
View
50 disk-collaborationtoday/XPages/add.xsp
@@ -1,28 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<xp:view xmlns:xe="http://www.ibm.com/xsp/coreex" xmlns:xp="http://www.ibm.com/xsp/core" xmlns:xc="http://www.ibm.com/xsp/custom"
+ beforePageLoad="#{pageController.beforePageLoad}" afterPageLoad="#{pageController.afterPageLoad}"
pageTitle="Capture story | Collaboration Today">
- <!-- TODO: move inline style out to a separate file -->
- <!-- TODO: switch from sessionScope to viewScope if possible -->
- <style>.lotusTitleBar h2.lotusEllipsis { width: 380px; } .xspPagerRight { color: #848484; float: left;}</style>
- <style>
- .busyShown { background-image: url("Loading.gif"); background-repeat: no-repeat; height: 32px; position: relative; width: 32px; } .busyHidden {
- display:none; }
- </style>
- <xp:this.beforeRenderResponse><![CDATA[#{javascript:
- var exCon = facesContext.getExternalContext();
- var exReq = exCon.getRequest();
- var response = exCon.getResponse();
- response.setHeader("Cache-Control", "no-cache");
-
- var command = param.get("c");
- if(command == "addurl") {
- var body = param.get("b");
- var subject = param.get("t");
-
- getComponent('inputText1').setValue(body);
- }
- }]]></xp:this.beforeRenderResponse>
+ <xp:this.resources>
+ <xp:styleSheet href="/add.css"/>
+ </xp:this.resources>
<xe:keepSessionAlive id="keepSessionAlive1"/>
@@ -43,8 +26,8 @@
}
function hideBusy(){
- var docUnidClient = "#{javascript:sessionScope.get("NikFileName")}"
- if(docUnidClient=="") {
+ var docUnidClient = "#{viewScope.parsedDocUNID}"
+ if(docUnidClient == "") {
alert("There is an error getting site information...")
} else {
var buttonId = "#{id:button1}";
@@ -52,34 +35,25 @@
buttonElement.style.visibility = 'hidden';
var busyElement = document.getElementById("busy");
busyElement.className = "busyHidden";
- window.location = "moderateEntry.xsp?action=editDocument&documentId=" + docUnidClient;
+ window.location = "#{facesContext.externalContext.requestContextPath}/moderateEntry.xsp?action=editDocument&documentId=" + docUnidClient;
}
}
]]></xp:this.value>
</xp:scriptBlock>
<br />
<br />
- <xp:inputText id="inputText1" style="width:720px;"/>
+ <xp:inputText id="inputText1" style="width:720px;" defaultValue="${param.c == 'addurl' ? param.b : ''}" value="#{viewScope.addingURL}"/>
<br />
<br />
<br />
<div id="busy" class="busyHidden"></div>
<xp:button value="Capture and Edit" id="button1" styleClass="btn">
- <xp:eventHandler event="onclick" submit="true" refreshMode="partial" refreshId="nikcontent">
- <xp:this.action><![CDATA[#{javascript:
- var url = getComponent('inputText1').getValue();
- var docUNIDServer = org.openntf.news.http.core.Parser.getOutput(url);
- sessionScope.put("NikFileName", docUNIDServer);
- }]]></xp:this.action>
- <xp:this.script><![CDATA[showBusy()]]></xp:this.script>
- <xp:this.onComplete><![CDATA[hideBusy()]]></xp:this.onComplete>
+ <xp:eventHandler event="onclick" submit="true" refreshMode="partial" refreshId="nikcontent"
+ action="#{pageController.parseURL}">
+ <xp:this.script><![CDATA[ showBusy() ]]></xp:this.script>
+ <xp:this.onComplete><![CDATA[ hideBusy() ]]></xp:this.onComplete>
</xp:eventHandler>
</xp:button>
- <xp:text escape="false">
- <xp:this.value><![CDATA[#{javascript:
- "<input type='hidden' id='docUNID' value='" + sessionScope.get("NikFileName") + "'></input>"
- }]]></xp:this.value>
- </xp:text>
</xp:div>
</xc:moderationLayout>
</xp:view>
View
18 disk-collaborationtoday/XPages/add.xsp.metadata
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?><note class="form" maintenanceversion="3.3" replicaid="C2257B150047CB4E" version="8.5" xmlns="http://www.lotus.com/dxl">
-<noteinfo noteid="1c6" sequence="6" unid="D55657C2413D3668C2257B150047CF41">
-<created><datetime>20130217T150421,13+02</datetime></created>
-<modified><datetime>20130217T151335,61+02</datetime></modified>
-<revised><datetime>20130217T151335,59+02</datetime></revised>
-<lastaccessed><datetime>20130217T151335,59+02</datetime></lastaccessed>
-<addedtofile><datetime>20130217T150421,75+02</datetime></addedtofile></noteinfo>
-<updatedby><name>CN=Serdar Basegmez/O=developi</name></updatedby>
-<wassignedby><name>CN=Serdar Basegmez/O=developi</name></wassignedby>
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="1c6" sequence="8" unid="D21B2423B87412DD85257B60005F9D49">
+<created><datetime dst="true">20130503T132421,85-04</datetime></created>
+<modified><datetime dst="true">20130503T150345,70-04</datetime></modified>
+<revised><datetime dst="true">20130503T150345,68-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T150345,68-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T132421,90-04</datetime></addedtofile></noteinfo>
+<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
+<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
<item name="$Flags"><text>gC~4K</text></item>
<item name="$TITLE" sign="true"><text>add.xsp</text></item>
<item name="$Comment" sign="true"><text>Moderators Only</text></item>
View
5 disk-collaborationtoday/XPages/admin.xsp
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xp:view xmlns:xe="http://www.ibm.com/xsp/coreex" xmlns:xp="http://www.ibm.com/xsp/core"
- xmlns:xc="http://www.ibm.com/xsp/custom" pageTitle="Administration | Collaboration Today">
+<xp:view xmlns:xe="http://www.ibm.com/xsp/coreex" xmlns:xp="http://www.ibm.com/xsp/core" xmlns:xc="http://www.ibm.com/xsp/custom"
+ beforePageLoad="#{pageController.beforePageLoad}" afterPageLoad="#{pageController.afterPageLoad}"
+ pageTitle="Administration | Collaboration Today">
<xc:moderationLayout pageHeader="Administration">
<xp:this.facets>
View
22 disk-collaborationtoday/XPages/admin.xsp.metadata
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?><note class="form" maintenanceversion="3.0" replicaid="85257AA6004F5595" version="8.5" xmlns="http://www.lotus.com/dxl">
-<noteinfo noteid="1ba" sequence="26" unid="EEFC55E8D4E78A4E85257AA6004F5D26">
-<created><datetime dst="true">20121029T102651,90-04</datetime></created>
-<modified><datetime dst="true">20121030T131730,05-04</datetime></modified>
-<revised><datetime dst="true">20121030T131730,03-04</datetime></revised>
-<lastaccessed><datetime dst="true">20121030T131730,03-04</datetime></lastaccessed>
-<addedtofile><datetime dst="true">20121029T102651,98-04</datetime></addedtofile></noteinfo>
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="1c2" sequence="8" unid="0FE101BECA57C95285257B60005F9D0A">
+<created><datetime dst="true">20130503T132421,22-04</datetime></created>
+<modified><datetime dst="true">20130503T155201,22-04</datetime></modified>
+<revised><datetime dst="true">20130503T155201,20-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T155201,20-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T132421,28-04</datetime></addedtofile></noteinfo>
<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
<item name="$Flags"><text>gC~4K</text></item>
<item name="$TITLE" sign="true"><text>admin.xsp</text></item>
-
<item name="$Comment" sign="true"><text>Moderators Only</text></item>
+<item name="$DesignerVersion"><text>8.5</text></item>
+
+
-<item name="$FileNames" sign="true"><text>admin.xsp</text></item>
-<item name="$DesignerVersion"><text>8.5</text></item>
-</note>
+<item name="$FileNames" sign="true"><text>admin.xsp</text></item></note>
View
311 disk-collaborationtoday/XPages/author.xsp
@@ -1,66 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xp:view xmlns:xe="http://www.ibm.com/xsp/coreex" xmlns:xp="http://www.ibm.com/xsp/core" xmlns:xc="http://www.ibm.com/xsp/custom" xmlns:zonsf="http://www.zetaone.com/xsp-core"
+<xp:view xmlns:xe="http://www.ibm.com/xsp/coreex" xmlns:xp="http://www.ibm.com/xsp/core" xmlns:xc="http://www.ibm.com/xsp/custom"
+ xmlns:zonsf="http://www.zetaone.com/xsp-core"
+ beforePageLoad="#{pageController.beforePageLoad}" afterPageLoad="#{pageController.afterPageLoad}"
pageTitle="Author | Collaboration Today">
+
<xp:this.data>
- <xp:dominoDocument var="document11" formName="Person" action="editDocument">
- <xp:this.querySaveDocument><![CDATA[#{javascript:
- if (!document11.isNewNote()) { true; }
- else {
- var name = currentDocument.getItemValueString("PDisplayName");
- name = name.replaceAll("\\s","");
- name = name.replaceAll("\\W","");
- var pid = name.toLowerCase();
- var person = personsCache.getPerson(pid);
- if (person.getDisplayName() != "") false; else true;
- }
- }]]></xp:this.querySaveDocument>
- </xp:dominoDocument>
+ <xp:dominoDocument var="document11" formName="Person" action="editDocument" querySaveDocument="#{javascript:return pageController.querySaveDocument()}"/>
</xp:this.data>
- <style>.lotusTitleBar h2.lotusEllipsis { width: 380px; } .xspPagerRight { color: #848484; float: left;}</style>
+
+ <xp:this.resources>
+ <xp:styleSheet href="/author.css"/>
+ </xp:this.resources>
+
<xc:moderationLayout pageHeader="Author">
<xp:this.facets>
<xc:moderationLeftColumn xp:key="leftColumn"/>
</xp:this.facets>
- <xp:button value="Update" id="button5" styleClass="btn">
- <xp:this.rendered><![CDATA[#{javascript:!document11.isNewNote()}]]></xp:this.rendered>
+ <xp:button value="Update" id="button5" styleClass="btn" rendered="#{!pageController.newNote}">
<xp:eventHandler event="onclick" submit="true" refreshMode="complete">
<xp:this.action>
<xp:actionGroup>
- <xp:actionGroup>
- <xp:saveDocument var="document11"></xp:saveDocument>
- <xp:executeScript script="#{javascript:personsCache.update();}"></xp:executeScript>
- <xp:openPage target="openDocument" name="/authors.xsp"></xp:openPage>
- </xp:actionGroup>
+ <xp:saveDocument var="document11"/>
+ <xp:executeScript script="#{personsCache.update}"/>
+ <xp:openPage target="openDocument" name="/authors.xsp"/>
</xp:actionGroup>
</xp:this.action>
</xp:eventHandler>
</xp:button>
&#160;
- <xp:button value="Create" id="button1" styleClass="btn">
- <xp:this.rendered><![CDATA[#{javascript:document11.isNewNote()}]]></xp:this.rendered>
+ <xp:button value="Create" id="button1" styleClass="btn" rendered="#{pageController.newNote}">
<xp:eventHandler event="onclick" submit="true" refreshMode="complete">
<xp:this.action>
<xp:actionGroup>
- <xp:executeScript>
- <xp:this.script><![CDATA[#{javascript:
- var date = new java.util.Date();
- document11.replaceItemValue('PCreationDate', date);
-
- var name = currentDocument.getItemValueString("PDisplayName");
- name = name.replaceAll("\\s","");
- name = name.replaceAll("\\W","");
- name = name.toLowerCase();
- document11.replaceItemValue('PID', name);
- }]]></xp:this.script>
- </xp:executeScript>
+ <xp:executeScript script="#{pageController.processNewDoc}"/>
- <xp:saveDocument var="document11"></xp:saveDocument>
- <xp:executeScript script="#{javascript:personsCache.update();}"></xp:executeScript>
- <xp:openPage target="editDocument">
- <xp:this.name><![CDATA[#{javascript:
- newsId ? "moderateEntry.xsp" :"authors.xsp"
- }]]></xp:this.name>
+ <xp:saveDocument var="document11"/>
+ <xp:executeScript script="#{personsCache.update}"/>
+ <xp:openPage target="editDocument" name="#{newsId ? '/moderateEntry.xsp' : '/authors.xsp'}">
<xp:this.documentId><![CDATA[#{javascript:newsId = sessionScope.nid;sessionScope.nid = null; newsId}]]></xp:this.documentId>
</xp:openPage>
</xp:actionGroup>
@@ -76,159 +53,103 @@
<br></br>
<br></br>
<br></br>
- <xp:table id="userInfoTable">
- <tr>
- <td>
- <xp:label value="Display Name (*)" id="pDisplayName_Label1" for="pDisplayName1"></xp:label>
- </td>
- <td>
- <xp:inputText value="#{document11.PDisplayName}" id="pDisplayName1" style="width:500px" required="true">
- <xp:this.validators>
- <xp:validateRequired message="Define display name"></xp:validateRequired>
- <xp:validateLength minimum="3" maximum="40" message="Define display name (5 - 40 chars)"></xp:validateLength>
- </xp:this.validators>
- </xp:inputText>
- </td>
- </tr>
- <tr>
- <td>
- <xp:label value="E-Mail" id="pEMail_Label1" for="pEMail1"></xp:label>
- </td>
- <td>
- <xp:inputText value="#{document11.PEMail}" style="width:500px" id="pEMail1"></xp:inputText>
- </td>
- </tr>
- <xp:panel rendered="#{javascript:configCache.isUserAvatarModerator(@UserName())}">
- <tr>
- <td>
- <xp:label value="Picture Type" id="pPictureType_Label1" for="pPictureType1"></xp:label>
- </td>
- <td>
- <xp:comboBox value="#{document11.PPictureType}" style="width:500px" id="pPictureType1">
- <xp:eventHandler event="onchange" submit="true" disableValidators="true"
- refreshMode="partial" refreshId="userInfoTable" execMode="partial" execId="userInfoTable"/>
+
+ <xp:div styleClass="form-horizontal" id="userInfoTable">
+
+ <xc:bsControlGroup label="Display Name (*)">
+ <xp:inputText value="#{document11.PDisplayName}" id="pDisplayName1" style="width:500px" required="true">
+ <xp:this.validators>
+ <xp:validateRequired message="Define display name"></xp:validateRequired>
+ <xp:validateLength minimum="3" maximum="40" message="Define display name (5 - 40 chars)"></xp:validateLength>
+ </xp:this.validators>
+ </xp:inputText>
+ </xc:bsControlGroup>
+
+ <xc:bsControlGroup label="E-Mail">
+ <xp:inputText value="#{document11.PEMail}" style="width:500px" id="pEMail1"/>
+ </xc:bsControlGroup>
+
+ <xp:div rendered="#{javascript:configCache.isUserAvatarModerator(@UserName())}">
+ <xc:bsControlGroup label="Picture Type">
+ <xp:comboBox value="#{document11.PPictureType}" style="width:500px" id="pPictureType1">
+ <xp:eventHandler event="onchange" submit="true" disableValidators="true"
+ refreshMode="partial" refreshId="userInfoTable" execMode="partial" execId="userInfoTable"/>
+
+ <xp:selectItem itemLabel="No Picture" itemValue="nopicture"/>
+ <xp:selectItem itemLabel="Multiple Authors" itemValue="multiple"/>
+ <xp:selectItem itemLabel="Gravatar" itemValue="gravatar"/>
+ <xp:selectItem itemLabel="URL" itemValue="url"/>
+ <xp:selectItem itemLabel="mypic" itemValue="mypic"/>
+ </xp:comboBox>
+ </xc:bsControlGroup>
+
+ <xc:bsControlGroup rendered="#{document1.PPictureType != 'mypic'}" label="Picture URL">
+ <xp:inputText value="#{document11.PPictureURL}" id="pPictureURL1" style="width:500px"/>
+ </xc:bsControlGroup>
+
+ <xc:bsControlGroup rendered="#{document11.PPictureType == 'mypic'}" label="myPic">
+ <xp:repeat value="#{document11.myPicNames}" var="name" rows="1000" id="mypicList">
+ <div class="#{javascript:name == document11.getValue('currentMypic') ? ' selected' : ''} mypicImage">
+ <!-- TODO Test this -->
+ <xp:image url="/delete.png" id="delete" styleClass="deleteMypic">
+ <xp:eventHandler event="onclick" submit="true" refreshMode="partial" refreshId="mypicList"
+ action="#{pageController.deleteMypic}">
+ <xp:this.script><![CDATA[
+ return XSP.confirm('Are you sure you want to permanently delete this mypic?')
+ ]]></xp:this.script>
+ </xp:eventHandler>
+ </xp:image>
- <xp:selectItem itemLabel="No Picture" itemValue="nopicture"/>
- <xp:selectItem itemLabel="Multiple Authors" itemValue="multiple"/>
- <xp:selectItem itemLabel="Gravatar" itemValue="gravatar"/>
- <xp:selectItem itemLabel="URL" itemValue="url"/>
- <xp:selectItem itemLabel="mypic" itemValue="mypic"/>
- </xp:comboBox>
- </td>
- </tr>
- <xp:tr rendered="#{document11.PPictureType != 'mypic'}">
- <td>
- <xp:label value="Picture URL" id="pPictureURL_Label1" for="pPictureURL1"></xp:label>
- </td>
- <td>
- <xp:inputText value="#{document11.PPictureURL}" id="pPictureURL1" style="width:500px"></xp:inputText>
- </td>
- </xp:tr>
- <xp:tr rendered="#{document11.PPictureType == 'mypic'}">
- <td>myPic</td>
- <td>
- <xp:repeat value="#{document11.myPicNames}" var="name" rows="1000" id="mypicList">
- <div class="#{javascript:name == document11.getValue('currentMypic') ? ' selected' : ''} mypicImage">
- <xp:image url="/delete.png" id="delete" styleClass="deleteMypic">
- <xp:eventHandler event="onclick" submit="true" refreshMode="partial" refreshId="mypicList">
- <xp:this.script><![CDATA[
- return XSP.confirm('Are you sure you want to permanently delete this mypic?')
- ]]></xp:this.script>
- <xp:this.action><![CDATA[#{javascript:
- var mypic = document11.getDocument(true)
- var rtItem:NotesRichTextItem = mypic.getFirstItem('mypics')
- var image:NotesEmbeddedObject = rtItem.getEmbeddedObject(name)
- image.remove()
- var mypicNames = mypic.getFirstItem('mypicNames')
- var rVals = mypicNames.getValues()
- rVals.remove(name)
- mypicNames.setValues(rVals)
- if (mypic.getItemValueString('currentMypic') == name) {
- if (mypicNames.getValues() == null) {
- mypic.replaceItemValue('currentMypic', '')
- } else {
- mypic.replaceItemValue('currentMypic', mypicNames.getValues().get(0))
- }
- }
- document11.save()
- }]]></xp:this.action>
- </xp:eventHandler>
- </xp:image>
-
- <zonsf:mypic
- ImageSize="75"
- UserName="#{document11.PDisplayName}"
- ServiceUrl="#{facesContext.externalContext.requestContextPath}/mypicApi.xsp"
- Format="PNG"
- id="mypicImage"
- ImageName="#{name}">
- <xp:eventHandler event="onclick" submit="true" refreshMode="partial" refreshId="mypicList">
- <xp:this.action><![CDATA[#{javascript:
- document11.replaceItemValue('currentMypic', name)
- document11.save()
- }]]></xp:this.action>
- </xp:eventHandler>
- </zonsf:mypic>
- </div>
- </xp:repeat>
- <xp:panel tagName="p" rendered="#{javascript:!document11.isNewNote()}" style="clear: left">
- <xp:text tagName="b" value="Replace:"/>
- <br />
- <xp:link text="Image File" value="/mypicUploadFile.xsp">
- <xp:this.parameters>
- <xp:parameter name="documentId" value="#{javascript:document11.getDocument().getUniversalID()}"/>
- </xp:this.parameters>
- </xp:link>
- <br />
- <xp:link text="Internet Profile" value="/mypicUploadInternet.xsp">
- <xp:this.parameters>
- <xp:parameter name="documentId" value="#{javascript:document11.getDocument().getUniversalID()}"/>
- </xp:this.parameters>
- </xp:link>
- </xp:panel>
- </td>
- </xp:tr>
- </xp:panel>
- <tr>
- <td>
- <xp:label value="Twitter" id="pTwitter_Label1" for="pTwitter1"></xp:label>
- </td>
- <td>
- <xp:inputText value="#{document11.PTwitter}" style="width:500px" id="pTwitter1"></xp:inputText>
- </td>
- </tr>
- <tr>
- <td>
- <xp:label value="StackOverflow" id="pStackOverflow_Label1" for="pStackOverflow1"></xp:label>
- </td>
- <td>
- <xp:inputText style="width:500px" value="#{document11.PStackOverflow}" id="pStackOverflow1"></xp:inputText>
- </td>
- </tr>
- <tr>
- <td>
- <xp:label value="LinkedIn" id="pLinkedIn_Label1" for="pLinkedIn1"></xp:label>
- </td>
- <td>
- <xp:inputText value="#{document11.PLinkedIn}" style="width:500px" id="pLinkedIn1"></xp:inputText>
- </td>
- </tr>
- <tr>
- <td>
- <xp:label value="OpenNTF" id="pOpenNTF_Label1" for="pOpenNTF1"></xp:label>
- </td>
- <td>
- <xp:inputText value="#{document11.POpenNTF}" style="width:500px" id="pOpenNTF1"></xp:inputText>
- </td>
- </tr>
- <tr>
- <td>
- <xp:label value="Lotus Registration" id="pLotusRegistration_Label1" for="pLotusRegistration1"></xp:label>
- </td>
- <td>
- <xp:inputText style="width:500px" value="#{document11.PLotusRegistration}" id="pLotusRegistration1"></xp:inputText>
- </td>
- </tr>
- </xp:table>
+ <zonsf:mypic
+ ImageSize="75"
+ UserName="#{document11.PDisplayName}"
+ ServiceUrl="#{facesContext.externalContext.requestContextPath}/mypicApi.xsp"
+ Format="PNG"
+ id="mypicImage"
+ ImageName="#{name}">
+ <xp:eventHandler event="onclick" submit="true" refreshMode="partial" refreshId="mypicList"
+ action="#{pageController.chooseMypic}"/>
+ </zonsf:mypic>
+ </div>
+ </xp:repeat>
+ <xp:panel tagName="p" rendered="#{javascript:!document11.isNewNote()}" style="clear: left">
+ <xp:text tagName="b" value="Replace:"/>
+ <br />
+ <xp:link text="Image File" value="/mypicUploadFile.xsp">
+ <xp:this.parameters>
+ <xp:parameter name="documentId" value="#{pageController.universalID}"/>
+ </xp:this.parameters>
+ </xp:link>
+ <br />
+ <xp:link text="Internet Profile" value="/mypicUploadInternet.xsp">
+ <xp:this.parameters>
+ <xp:parameter name="documentId" value="#{pageController.universalID}"/>
+ </xp:this.parameters>
+ </xp:link>
+ </xp:panel>
+ </xc:bsControlGroup>
+ </xp:div>
+
+ <xc:bsControlGroup label="Twitter">
+ <xp:inputText value="#{document11.PTwitter}" style="width:500px" id="pTwitter1"/>
+ </xc:bsControlGroup>
+
+ <xc:bsControlGroup label="StackOverflow">
+ <xp:inputText style="width:500px" value="#{document11.PStackOverflow}" id="pStackOverflow1"/>
+ </xc:bsControlGroup>
+
+ <xc:bsControlGroup label="LinkedIn">
+ <xp:inputText value="#{document11.PLinkedIn}" style="width:500px" id="pLinkedIn1"/>
+ </xc:bsControlGroup>
+
+ <xc:bsControlGroup label="OpenNTF">
+ <xp:inputText value="#{document11.POpenNTF}" style="width:500px" id="pOpenNTF1"/>
+ </xc:bsControlGroup>
+
+ <xc:bsControlGroup label="Lotus Registration">
+ <xp:inputText style="width:500px" value="#{document11.PLotusRegistration}" id="pLotusRegistration1"/>
+ </xc:bsControlGroup>
+
+ </xp:div>
</xc:moderationLayout>
</xp:view>
View
20 disk-collaborationtoday/XPages/author.xsp.metadata
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B6000522FB6" version="9.0" xmlns="http://www.lotus.com/dxl">
-<noteinfo noteid="1ba" sequence="7" unid="06B892686711B81585257B6000523291">
-<created><datetime dst="true">20130503T105748,97-04</datetime></created>
-<modified><datetime dst="true">20130503T105836,72-04</datetime></modified>
-<revised><datetime dst="true">20130503T105836,70-04</datetime></revised>
-<lastaccessed><datetime dst="true">20130503T105836,70-04</datetime></lastaccessed>
-<addedtofile><datetime dst="true">20130503T105748,98-04</datetime></addedtofile></noteinfo>
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="1ba" sequence="9" unid="4959E2B9F0A2E83585257B60005F9C9F">
+<created><datetime dst="true">20130503T132420,15-04</datetime></created>
+<modified><datetime dst="true">20130503T155214,36-04</datetime></modified>
+<revised><datetime dst="true">20130503T155214,34-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T155214,34-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T132420,19-04</datetime></addedtofile></noteinfo>
<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
<item name="$Flags"><text>gC~4K</text></item>
<item name="$TITLE"><text>author.xsp</text></item>
<item name="$Comment" sign="true"><text>Moderators Only</text></item>
+<item name="$DesignerVersion"><text>8.5.3</text></item>
+
-<item name="$FileNames" sign="true"><text>author.xsp</text></item>
-<item name="$DesignerVersion"><text>8.5.3</text></item>
-</note>
+<item name="$FileNames" sign="true"><text>author.xsp</text></item></note>
View
16 disk-collaborationtoday/XPages/authors.xsp
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<xp:view xmlns:xe="http://www.ibm.com/xsp/coreex" xmlns:xp="http://www.ibm.com/xsp/core" xmlns:xc="http://www.ibm.com/xsp/custom"
+ beforePageLoad="#{pageController.beforePageLoad}" afterPageLoad="#{pageController.afterPageLoad}"
pageTitle="Authors | Collaboration Today">
+
<xp:this.resources>
<xp:styleSheet href="/view.css"/>
</xp:this.resources>
@@ -10,24 +12,22 @@
<xc:moderationLeftColumn xp:key="leftColumn"/>
</xp:this.facets>
- <xp:button value="New" id="button5" styleClass="btn">
- <xp:eventHandler event="onclick" submit="true" refreshMode="complete" action="new-author"/>
- </xp:button>
+ <xp:link styleClass="btn" text="New" value="/author.xsp?action=newDocument"/>
<br />
- <xc:ccPager pagerFor="viewPanel1"></xc:ccPager>
+ <xc:ccPager pagerFor="viewPanel1"/>
<xp:viewPanel rows="30" id="viewPanel1" pageName="/author.xsp" viewStyleClass="viewPanel" dataTableStyleClass="dataTableViewPanel">
<xp:this.data>
- <xp:dominoView var="view1" viewName="PersonsAll" sortColumn="PDisplayName"></xp:dominoView>
+ <xp:dominoView var="view1" viewName="PersonsAll" sortColumn="PDisplayName"/>
</xp:this.data>
<xp:viewColumn columnName="PDisplayName" id="viewColumn2" displayAs="link" styleClass="columnView25">
- <xp:viewColumnHeader value="Display Name" id="viewColumnHeader2" sortable="true"></xp:viewColumnHeader>
+ <xp:viewColumnHeader value="Display Name" id="viewColumnHeader2" sortable="true"/>
</xp:viewColumn>
<xp:viewColumn columnName="PEMail" id="viewColumn4" styleClass="columnView25">
- <xp:viewColumnHeader value="E-Mail" id="viewColumnHeader4"></xp:viewColumnHeader>
+ <xp:viewColumnHeader value="E-Mail" id="viewColumnHeader4"/>
</xp:viewColumn>
<xp:viewColumn columnName="PID" id="viewColumn1">
- <xp:viewColumnHeader value="ID" id="viewColumnHeader1"></xp:viewColumnHeader>
+ <xp:viewColumnHeader value="ID" id="viewColumnHeader1"/>
</xp:viewColumn>
</xp:viewPanel>
</xc:moderationLayout>
View
22 disk-collaborationtoday/XPages/authors.xsp.metadata
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?><note class="form" maintenanceversion="3.0" replicaid="85257AA6004F5595" version="8.5" xmlns="http://www.lotus.com/dxl">
-<noteinfo noteid="1ae" sequence="19" unid="56A69D7B3FD8760185257AA6004F5C98">
-<created><datetime dst="true">20121029T102650,48-04</datetime></created>
-<modified><datetime dst="true">20121030T131729,27-04</datetime></modified>
-<revised><datetime dst="true">20121030T131729,25-04</datetime></revised>
-<lastaccessed><datetime dst="true">20121030T131729,25-04</datetime></lastaccessed>
-<addedtofile><datetime dst="true">20121029T102650,56-04</datetime></addedtofile></noteinfo>
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="1b6" sequence="8" unid="2A56890E96B1A95F85257B60005F9C62">
+<created><datetime dst="true">20130503T132419,54-04</datetime></created>
+<modified><datetime dst="true">20130503T155221,84-04</datetime></modified>
+<revised><datetime dst="true">20130503T155221,82-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T155221,82-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T132419,58-04</datetime></addedtofile></noteinfo>
<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
<item name="$Flags"><text>gC~4K</text></item>
<item name="$TITLE" sign="true"><text>authors.xsp</text></item>
-
<item name="$Comment" sign="true"><text>Moderators Only</text></item>
+<item name="$DesignerVersion"><text>8.5</text></item>
+
+
-<item name="$FileNames" sign="true"><text>authors.xsp</text></item>
-<item name="$DesignerVersion"><text>8.5</text></item>
-</note>
+<item name="$FileNames" sign="true"><text>authors.xsp</text></item></note>
View
159 disk-collaborationtoday/XPages/contact.xsp
@@ -1,134 +1,115 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xp:view xmlns:xp="http://www.ibm.com/xsp/core" xmlns:xc="http://www.ibm.com/xsp/custom" pageTitle="Contact | Collaboration Today">
+<xp:view xmlns:xp="http://www.ibm.com/xsp/core" xmlns:xc="http://www.ibm.com/xsp/custom"
+ beforePageLoad="#{pageController.beforePageLoad}" afterPageLoad="#{pageController.afterPageLoad}"
+ pageTitle="Contact | Collaboration Today">
+
<xp:this.data>
- <xp:dominoDocument var="document1" formName="Request"></xp:dominoDocument>
+ <xp:dominoDocument var="document1" formName="Request" />
</xp:this.data>
- <style>
- #recaptcha_bg_image { /*width: 410px !important;*/ } #recaptcha_response_field { left: 35px !important; /* top: 118px !important; */ width: 130px
- !important; } #rc_enter_image, #rc_enter_audio { left: 36px !important; /* top: 94px !important; */ } #rc_reload { /* left: 246px !important; */ /* top:
- 96px !important; */ } #rc_audio { /* left: 246px !important; */ /* top: 118px !important; */ } #rc_help { /* left: 246px !important; */ /* top: 138px
- !important; */ } #recaptcha_image { /* left: 12px !important; */ /* top: 10px !important; */ }
- </style>
+ <xp:this.resources>
+ <xp:styleSheet href="/recaptcha.css"/>
+ </xp:this.resources>
+
<xc:layout>
<xp:this.facets>
- <xc:rightColumn xp:key="rightColumn"></xc:rightColumn>
- <xc:leftColumn xp:key="leftColumn"></xc:leftColumn>
+ <xc:rightColumn xp:key="rightColumn"/>
+ <xc:leftColumn xp:key="leftColumn"/>
</xp:this.facets>
<div class="well">
<h1>
<small>Contact Collaboration Today</small>
</h1>
- <xp:br></xp:br>
- <xp:table styleClass="contact" style="width:100%">
- <xp:tr>
- <xp:td>
- <xp:label value="EMail *" id="rEMail_Label1" for="rEMail1"></xp:label>
- </xp:td>
- <xp:td>
+ <br />
+ <table class="contact" style="width:100%">
+ <tr>
+ <td>
+ <xp:label value="EMail *" id="rEMail_Label1" for="rEMail1"/>
+ </td>
+ <td>
<xp:inputText value="#{document1.REMail}" style="width:99%" id="rEMail1" required="true">
<xp:this.validators>
- <xp:validateRequired message="Please enter an email address."></xp:validateRequired>
- <xp:validateLength message="Please enter an email address." minimum="5" maximum="50"></xp:validateLength>
+ <xp:validateRequired message="Please enter an email address."/>
+ <xp:validateLength message="Please enter an email address." minimum="5" maximum="50"/>
</xp:this.validators>
</xp:inputText>
- </xp:td>
- </xp:tr>
- <xp:tr>
- <xp:td>
- <xp:label value="Subject *" id="rSubject_Label1" for="rSubject1"></xp:label>
- </xp:td>
- <xp:td>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <xp:label value="Subject *" id="rSubject_Label1" for="rSubject1"/>
+ </td>
+ <td>
<xp:inputText value="#{document1.RSubject}" style="width:99%" id="rSubject1" required="true">
<xp:this.validators>
- <xp:validateRequired message="Please enter a subject."></xp:validateRequired>
- <xp:validateLength message="Please enter a subject." minimum="5" maximum="150"></xp:validateLength>
+ <xp:validateRequired message="Please enter a subject."/>
+ <xp:validateLength message="Please enter a subject." minimum="5" maximum="150"/>
</xp:this.validators>
</xp:inputText>
- </xp:td>
- </xp:tr>
- <xp:tr>
- <xp:td>
- <xp:label value="Category" id="rCategory_Label1" for="rCategory1"></xp:label>
- </xp:td>
- <xp:td>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <xp:label value="Category" id="rCategory_Label1" for="rCategory1"/>
+ </td>
+ <td>
<xp:comboBox value="#{document1.RCategory}" style="width:99%" id="rCategory1">
- <xp:selectItem itemLabel="Suggest Article" itemValue="article"></xp:selectItem>
- <xp:selectItem itemLabel="Change Profile Avatar" itemValue="profile"></xp:selectItem>
- <xp:selectItem itemLabel="Feedback" itemValue="feedback"></xp:selectItem>
- <xp:selectItem itemLabel="Other" itemValue="other"></xp:selectItem>
+ <xp:selectItem itemLabel="Suggest Article" itemValue="article"/>
+ <xp:selectItem itemLabel="Change Profile Avatar" itemValue="profile"/>
+ <xp:selectItem itemLabel="Feedback" itemValue="feedback"/>
+ <xp:selectItem itemLabel="Other" itemValue="other"/>
</xp:comboBox>
- </xp:td>
- </xp:tr>
- <xp:tr>
- <xp:td>
- <xp:label value="Comment" id="rBody_Label1" for="rBody1"></xp:label>
- </xp:td>
- <xp:td>
- <xp:inputTextarea value="#{document1.RBody}" style="width:99%;height:200px" id="rBody1"></xp:inputTextarea>
- </xp:td>
- </xp:tr>
- <xp:tr>
- <xp:td></xp:td>
- <xp:td>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <xp:label value="Comment" id="rBody_Label1" for="rBody1"/>
+ </td>
+ <td>
+ <xp:inputTextarea value="#{document1.RBody}" style="width:99%;height:200px" id="rBody1"/>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
<xc:recaptcha_cc>
<xc:this.behavior>
<xc:behavior>
<xc:this.errorHandling>
- <xc:errorHandling validateOnlyOnce="true" errorMessageTxt="You've entered an incorrect captcha solution">
- </xc:errorHandling>
+ <xc:errorHandling validateOnlyOnce="true" errorMessageTxt="You've entered an incorrect captcha solution"/>
</xc:this.errorHandling>
<xc:this.userInterface>
- <xc:userInterface focusOnLoad="true"></xc:userInterface>
+ <xc:userInterface focusOnLoad="true"/>
</xc:this.userInterface>
</xc:behavior>
</xc:this.behavior>
<xc:this.recaptchaWidget>
<xc:recaptchaWidget useHttps="false" lang="en" returnValIfServiceUnavailable="true"
- publicKey="#{javascript:configCache.getCaptchaPublicKey()}" privateKey="#{javascript:configCache.getCaptchaPrivateKey()}" theme="oneui">
- </xc:recaptchaWidget>
+ publicKey="#{configCache.captchaPublicKey}" privateKey="#{configCache.captchaPrivateKey}" theme="oneui"/>
</xc:this.recaptchaWidget>
</xc:recaptcha_cc>
- </xp:td>
- </xp:tr>
- <xp:tr>
- <xp:td>&#160;</xp:td>
- </xp:tr>
- <xp:tr>
- <xp:td></xp:td>
- <xp:td>
+ </td>
+ </tr>
+ <tr>
+ <td>&#160;</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
<xp:button value="Submit" id="button1" styleClass="btn">
<xp:eventHandler event="onclick" submit="true" refreshMode="complete">
<xp:this.action>
<xp:actionGroup>
- <xp:actionGroup>
- <xp:executeScript>
- <xp:this.script><![CDATA[#{javascript:
- var date = new java.util.Date();
- document1.replaceItemValue('RCreationDate', date);
- document1.replaceItemValue('RState', 'open');
- }]]></xp:this.script>
- </xp:executeScript>
- <xp:openPage target="editDocument">
- <xp:this.name><![CDATA[#{javascript:"home.xsp"}]]></xp:this.name>
- </xp:openPage>
- <xp:saveDocument var="document1"></xp:saveDocument>
- </xp:actionGroup>
+ <xp:executeScript script="#{pageController.querySaveRequest}"/>
+ <xp:openPage target="openDocument" name="/home.xsp"/>
+ <xp:saveDocument var="document1"/>
</xp:actionGroup>
</xp:this.action>
</xp:eventHandler>
</xp:button>
-
- <!--<xp:button value="Cancel" id="button8" styleClass="btn">
- <xp:eventHandler event="onclick" submit="false">
- <xp:this.script><![CDATA[window.history.back()]]></xp:this.script>
- </xp:eventHandler>
- </xp:button>
-
- -->
- </xp:td>
- </xp:tr>
- </xp:table>
+ </td>
+ </tr>
+ </table>
</div>
</xc:layout>
View
23 disk-collaborationtoday/XPages/contact.xsp.metadata
@@ -1,15 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?><note class="form" maintenanceversion="3.0" replicaid="85257AA6004F5595" version="8.5" xmlns="http://www.lotus.com/dxl">
-<noteinfo noteid="1aa" sequence="3" unid="2C55E6946423EE0385257AA6004F5C69">
-<created><datetime dst="true">20121029T102650,01-04</datetime></created>
-<modified><datetime dst="true">20121029T102650,35-04</datetime></modified>
-<revised><datetime dst="true">20121029T102650,34-04</datetime></revised>
-<lastaccessed><datetime dst="true">20121029T102650,34-04</datetime></lastaccessed>
-<addedtofile><datetime dst="true">20121029T102650,09-04</datetime></addedtofile></noteinfo>
-<updatedby><name>CN=Jesse Gallagher/O=MTC</name></updatedby>
-<wassignedby><name>CN=Jesse Gallagher/O=MTC</name></wassignedby>
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="1b2" sequence="16" unid="51D882481E05006085257B60005F9C26">
+<created><datetime dst="true">20130503T132418,94-04</datetime></created>
+<modified><datetime dst="true">20130503T143702,62-04</datetime></modified>
+<revised><datetime dst="true">20130503T143702,60-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T143702,60-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T132418,98-04</datetime></addedtofile></noteinfo>
+<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
+<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
<item name="$Flags"><text>gC~4K</text></item>
<item name="$TITLE" sign="true"><text>contact.xsp</text></item>
<item name="$DesignerVersion"><text>8.5</text></item>
+
+
+
+
+
<item name="$FileNames" sign="true"><text>contact.xsp</text></item></note>
View
2  disk-collaborationtoday/XPages/feed.xsp
@@ -21,8 +21,6 @@
<xp:script src="/xpNewsFeedGenerator.jss" clientSide="false"/>
</xp:this.resources>
<xp:this.afterRenderResponse><![CDATA[#{javascript:
- facesContext.getExternalContext().getResponse().sendError(500,"Internal Server Error");
- return;
try {
var generator = new FeedGenerator();
generator.getFeed();
View
25 disk-collaborationtoday/XPages/follow.xsp
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xp:view xmlns:xp="http://www.ibm.com/xsp/core" xmlns:xc="http://www.ibm.com/xsp/custom" pageTitle="Stay Connected | Collaboration Today">
+<xp:view xmlns:xp="http://www.ibm.com/xsp/core" xmlns:xc="http://www.ibm.com/xsp/custom"
+ beforePageLoad="#{pageController.beforePageLoad}" afterPageLoad="#{pageController.afterPageLoad}"
+ pageTitle="Stay Connected | Collaboration Today">
+
<xc:layout>
<xp:this.facets>
- <xc:rightColumn xp:key="rightColumn"></xc:rightColumn>
- <xc:leftColumn xp:key="leftColumn"></xc:leftColumn>
+ <xc:rightColumn xp:key="rightColumn"/>
+ <xc:leftColumn xp:key="leftColumn"/>
</xp:this.facets>
<div class="well">
@@ -49,22 +52,6 @@
<xp:link text="Spotlight" value="/feed.xsp?filter=spotlight"/>
<br></br>
<br></br>
-
- <xp:text escape="false">
- <xp:this.value><![CDATA[#{javascript:
- var output = "";
- var types:java.util.ArrayList;
- types = configCache.getTypes();
- if (types != null) {
- var it = types.iterator();
- for (; it.hasNext();) {
- var type = it.next();
- output = output + "<span class='label label-warning'>RSS</span>&#160;<a href='./feed.xsp?filter=" + type.getID() + "'>" + configCache.getCategory(type.getCategoryId()).getDisplayName() + ' - ' + type.getDisplayName() +"</a><br></br>";
- }
- }
- output
- }]]></xp:this.value>
- </xp:text>
<xp:repeat value="#{configCache.types}" var="type" removeRepeat="true">
<span class="label label-warning">RSS</span>&#160;<xp:link value="/feed.xsp?filter=#{type.ID}" text="#{pageController.typeCategoryName} - #{type.displayName}"/>
View
13 disk-collaborationtoday/XPages/mod.xsp
@@ -9,19 +9,18 @@
<xp:panel>
<xp:this.data>
- <xp:dominoView var="view1" viewName="NewsAll" categoryFilter="queued"></xp:dominoView>
+ <xp:dominoView var="view1" viewName="NewsAll" categoryFilter="queued"/>
</xp:this.data>
<br />
<xc:ccPager pagerFor="repeat1"/>
<br />
<xp:repeat id="repeat1" var="entry" rows="50" value="#{view1}">
- <xc:moderationNewsEntry creationDate="#{javascript:entry.getColumnValue('NCreationDate')}"
- link="#{javascript:entry.getColumnValue('NLink')}" nID="#{javascript:entry.getColumnValue('NID')}"
- personDisplayName="#{javascript:personsCache.getPerson(entry.getColumnValue('PID')).getDisplayName()}"
- publicationDate="#{javascript:entry.getColumnValue('NPublicationDate')}" title="#{javascript:entry.getColumnValue('NTitle')}"
- state="#{javascript:entry.getColumnValue('NState')}">
- </xc:moderationNewsEntry>
+ <xc:moderationNewsEntry creationDate="#{entry.NCreationDate}"
+ link="#{entry.NLink}" nID="#{entry.NID}"
+ personDisplayName="#{pageController.entryPerson.displayName}"
+ publicationDate="#{entry.NPublicationDate}" title="#{entry.NTitle}"
+ state="#{entry.NState}"/>
</xp:repeat>
</xp:panel>
</xc:moderationLayout>
View
22 disk-collaborationtoday/XPages/mod.xsp.metadata
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?><note class="form" maintenanceversion="3.0" replicaid="85257AA6004F5595" version="8.5" xmlns="http://www.lotus.com/dxl">
-<noteinfo noteid="196" sequence="16" unid="22C1B9E080A3597F85257AA6004F5B7C">
-<created><datetime dst="true">20121029T102647,64-04</datetime></created>
-<modified><datetime dst="true">20121030T131727,77-04</datetime></modified>
-<revised><datetime dst="true">20121030T131727,75-04</datetime></revised>
-<lastaccessed><datetime dst="true">20121030T131727,75-04</datetime></lastaccessed>
-<addedtofile><datetime dst="true">20121029T102647,72-04</datetime></addedtofile></noteinfo>
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="19e" sequence="9" unid="CC159365D15F44EF85257B60005F9B13">
+<created><datetime dst="true">20130503T132416,19-04</datetime></created>
+<modified><datetime dst="true">20130503T152539,10-04</datetime></modified>
+<revised><datetime dst="true">20130503T152539,08-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T152539,08-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T132416,24-04</datetime></addedtofile></noteinfo>
<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
<item name="$Flags"><text>gC~4K</text></item>
<item name="$TITLE" sign="true"><text>mod.xsp</text></item>
+<item name="$Comment" sign="true"><text>Moderators Only</text></item>
+<item name="$DesignerVersion"><text>8.5</text></item>
+
-<item name="$Comment" sign="true"><text>Moderators Only</text></item>
-<item name="$FileNames" sign="true"><text>mod.xsp</text></item>
-<item name="$DesignerVersion"><text>8.5</text></item>
-</note>
+<item name="$FileNames" sign="true"><text>mod.xsp</text></item></note>
View
14 disk-collaborationtoday/XPages/modApproved.xsp
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<xp:view xmlns:xe="http://www.ibm.com/xsp/coreex" xmlns:xp="http://www.ibm.com/xsp/core" xmlns:xc="http://www.ibm.com/xsp/custom"
+ beforePageLoad="#{pageController.beforePageLoad}" afterPageLoad="#{pageController.afterPageLoad}"
pageTitle="Moderated | Collaboration Today">
<xc:moderationLayout pageHeader="News Entries - Approved / Moderated - All">
@@ -12,15 +13,14 @@
<xp:dominoView var="view6" viewName="NewsAll" categoryFilter="approved"/>
</xp:this.data>
- <xc:ccPager pagerFor="repeat6"></xc:ccPager>
+ <xc:ccPager pagerFor="repeat6"/>
<br />
<xp:repeat id="repeat6" var="entry" rows="50" value="#{view6}">
- <xc:moderationNewsEntry creationDate="#{javascript:entry.getColumnValue('NCreationDate')}"
- link="#{javascript:entry.getColumnValue('NLink')}" nID="#{javascript:entry.getColumnValue('NID')}"
- personDisplayName="#{javascript:personsCache.getPerson(entry.getColumnValue('PID')).getDisplayName()}"
- publicationDate="#{javascript:entry.getColumnValue('NPublicationDate')}" title="#{javascript:entry.getColumnValue('NTitle')}"
- state="#{javascript:entry.getColumnValue('NState')}">
- </xc:moderationNewsEntry>
+ <xc:moderationNewsEntry creationDate="#{entry.NCreationDate}"
+ link="#{entry.NLink}" nID="#{entry.NID}"
+ personDisplayName="#{pageController.entryPerson.displayName}"
+ publicationDate="#{entry.NPublicationDate}" title="#{entry.NTitle}"
+ state="#{entry.NState}"/>
</xp:repeat>
</xp:panel>
</xc:moderationLayout>
View
18 disk-collaborationtoday/XPages/modApproved.xsp.metadata
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?><note class="form" maintenanceversion="3.0" replicaid="85257AA6004F5595" version="8.5" xmlns="http://www.lotus.com/dxl">
-<noteinfo noteid="192" sequence="16" unid="0999AD7B7DA50AD885257AA6004F5B50">
-<created><datetime dst="true">20121029T102647,20-04</datetime></created>
-<modified><datetime dst="true">20121030T151204,67-04</datetime></modified>
-<revised><datetime dst="true">20121030T151204,65-04</datetime></revised>
-<lastaccessed><datetime dst="true">20121030T151204,65-04</datetime></lastaccessed>
-<addedtofile><datetime dst="true">20121029T102647,28-04</datetime></addedtofile></noteinfo>
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="19a" sequence="8" unid="D7EA0D3BC99F4E4485257B60005F9AD6">
+<created><datetime dst="true">20130503T132415,58-04</datetime></created>
+<modified><datetime dst="true">20130503T155235,09-04</datetime></modified>
+<revised><datetime dst="true">20130503T155235,07-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T155235,07-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T132415,64-04</datetime></addedtofile></noteinfo>
<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
<item name="$Flags"><text>gC~4K</text></item>
<item name="$TITLE" sign="true"><text>modApproved.xsp</text></item>
+<item name="$Comment" sign="true"><text>Moderators Only</text></item>
+<item name="$DesignerVersion"><text>8.5</text></item>
-<item name="$Comment" sign="true"><text>Moderators Only</text></item>
-<item name="$DesignerVersion"><text>8.5</text></item>
View
8 disk-collaborationtoday/XPages/modPopular.xsp
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<xp:view xmlns:xe="http://www.ibm.com/xsp/coreex" xmlns:xp="http://www.ibm.com/xsp/core" xmlns:xc="http://www.ibm.com/xsp/custom"
+ beforePageLoad="#{pageController.beforePageLoad}" afterPageLoad="#{pageController.afterPageLoad}"
pageTitle="Moderated - Popular | Collaboration Today">
<xc:moderationLayout pageHeader="News Entries - Approved / Moderated - Popular">
@@ -7,14 +8,13 @@
<xc:moderationLeftColumn xp:key="leftColumn"/>
</xp:this.facets>
- <xc:ccPager pagerFor="repeat7"></xc:ccPager>
+ <xc:ccPager pagerFor="repeat7"/>
<br />
<xp:repeat id="repeat7" var="entry" rows="50" value="${newsCache.entriesByPopularity}">
<xc:moderationNewsEntry link="#{entry.link}" nID="#{entry.ID}"
- personDisplayName="#{javascript:personsCache.getPerson(entry.getPID()).getDisplayName()}" publicationDate="#{entry.prettyTime}"
+ personDisplayName="#{pageController.entryPerson.displayName}" publicationDate="#{entry.prettyTime}"
title="#{entry.title}" state="#{entry.state}" clicksTotal="#{entry.clicksTotal}"
- clicksLastWeek="#{entry.clicksLastWeek}">
- </xc:moderationNewsEntry>
+ clicksLastWeek="#{entry.clicksLastWeek}"/>
</xp:repeat>
</xc:moderationLayout>
</xp:view>
View
16 disk-collaborationtoday/XPages/modPopular.xsp.metadata
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?><note class="form" maintenanceversion="3.0" replicaid="85257AA6004F5595" version="8.5" xmlns="http://www.lotus.com/dxl">
-<noteinfo noteid="18e" sequence="18" unid="4E68391CB5B95C6785257AA6004F5B24">
-<created><datetime dst="true">20121029T102646,76-04</datetime></created>
-<modified><datetime dst="true">20121030T152225,63-04</datetime></modified>
-<revised><datetime dst="true">20121030T152225,61-04</datetime></revised>
-<lastaccessed><datetime dst="true">20121030T152225,61-04</datetime></lastaccessed>
-<addedtofile><datetime dst="true">20121029T102646,85-04</datetime></addedtofile></noteinfo>
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="196" sequence="8" unid="E85728489CF5F02A85257B60005F9AA9">
+<created><datetime dst="true">20130503T132415,13-04</datetime></created>
+<modified><datetime dst="true">20130503T155310,15-04</datetime></modified>
+<revised><datetime dst="true">20130503T155310,13-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T155310,13-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T132415,17-04</datetime></addedtofile></noteinfo>
<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
<item name="$Flags"><text>gC~4K</text></item>
<item name="$TITLE" sign="true"><text>modPopular.xsp</text></item>
-
<item name="$Comment" sign="true"><text>Moderators Only</text></item>
<item name="$DesignerVersion"><text>8.5</text></item>
@@ -18,4 +17,5 @@
+
<item name="$FileNames" sign="true"><text>modPopular.xsp</text></item></note>
View
8 disk-collaborationtoday/XPages/modSpotlight.xsp
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<xp:view xmlns:xe="http://www.ibm.com/xsp/coreex" xmlns:xp="http://www.ibm.com/xsp/core" xmlns:xc="http://www.ibm.com/xsp/custom"
+ beforePageLoad="#{pageController.beforePageLoad}" afterPageLoad="#{pageController.afterPageLoad}"
pageTitle="Moderated - Spotlight | Collaboration Today">
<xc:moderationLayout pageHeader="News Entries - Approved / Moderated - Spotlight">
@@ -7,20 +8,19 @@
<xc:moderationLeftColumn xp:key="leftColumn"/>
</xp:this.facets>
- <xp:panel loaded="${javascript:configCache.isUserSpotlightModerator(@UserName())}">
+ <xp:panel loaded="${pageController.currentUserSpotlightMod}">
<xp:repeat id="repeat5" var="entry" rows="50" value="${newsCache.spotlightEntries}">
<xc:moderationNewsEntry
link="#{entry.link}"
nID="#{entry.ID}"
- personDisplayName="#{javascript:personsCache.getPerson(entry.getPID()).getDisplayName()}"
+ personDisplayName="#{pageController.entryPerson.displayName}"
publicationDate="#{entry.prettyTime}"
title="#{entry.title}"
state="#{entry.state}"
clicksTotal="#{entry.clicksTotal}"
clicksLastWeek="#{entry.clicksLastWeek}"
- showRemoveSpotlightButton="yes">
- </xc:moderationNewsEntry>
+ showRemoveSpotlightButton="true"/>
</xp:repeat>
</xp:panel>
</xc:moderationLayout>
View
16 disk-collaborationtoday/XPages/modSpotlight.xsp.metadata
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?><note class="form" maintenanceversion="3.0" replicaid="85257AA6004F5595" version="8.5" xmlns="http://www.lotus.com/dxl">
-<noteinfo noteid="18a" sequence="17" unid="EA373186F46B7D4E85257AA6004F5AF5">
-<created><datetime dst="true">20121029T102646,29-04</datetime></created>
-<modified><datetime dst="true">20121030T152730,78-04</datetime></modified>
-<revised><datetime dst="true">20121030T152730,76-04</datetime></revised>
-<lastaccessed><datetime dst="true">20121030T152730,76-04</datetime></lastaccessed>
-<addedtofile><datetime dst="true">20121029T102646,38-04</datetime></addedtofile></noteinfo>
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="192" sequence="8" unid="81685E17B4CC5D4085257B60005F9A70">
+<created><datetime dst="true">20130503T132414,56-04</datetime></created>
+<modified><datetime dst="true">20130503T154707,33-04</datetime></modified>
+<revised><datetime dst="true">20130503T154707,31-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T154707,31-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T132414,61-04</datetime></addedtofile></noteinfo>
<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
<item name="$Flags"><text>gC~4K</text></item>
<item name="$TITLE" sign="true"><text>modSpotlight.xsp</text></item>
-
<item name="$Comment" sign="true"><text>Moderators Only</text></item>
<item name="$DesignerVersion"><text>8.5</text></item>
@@ -18,4 +17,5 @@
+
<item name="$FileNames" sign="true"><text>modSpotlight.xsp</text></item></note>
View
15 disk-collaborationtoday/XPages/modTopStories.xsp
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<xp:view xmlns:xe="http://www.ibm.com/xsp/coreex" xmlns:xp="http://www.ibm.com/xsp/core" xmlns:xc="http://www.ibm.com/xsp/custom"
+ beforePageLoad="#{pageController.beforePageLoad}" afterPageLoad="#{pageController.afterPageLoad}"
pageTitle="Moderated - Top Stories | Collaboration Today">
<xc:moderationLayout pageHeader="News Entries - Approved / Moderated - Top Stories">
@@ -7,7 +8,7 @@
<xc:moderationLeftColumn xp:key="leftColumn"/>
</xp:this.facets>
- <xp:panel loaded="${javascript:configCache.isUserTopStoriesModerator(@UserName())}">
+ <xp:panel loaded="${pageController.currentUserTopStoriesMod}">
<br />
<xp:text tagName="h4" styleClass="" value="Top"/>
<br />
@@ -15,14 +16,13 @@
<xc:moderationNewsEntry id="ndifm"
link="#{entryMTT.link}"
nID="#{entryMTT.ID}"
- personDisplayName="#{javascript:personsCache.getPerson(entryMTT.getPID()).getDisplayName()}"
+ personDisplayName="#{pageController.topStoryPerson.displayName}"
publicationDate="#{entryMTT.prettyTime}"
title="#{entryMTT.title}"
state="#{entryMTT.state}"
clicksTotal="#{entryMTT.clicksTotal}"
clicksLastWeek="#{entryMTT.clicksLastWeek}"
- showRemoveTopStoryButton="yes">
- </xc:moderationNewsEntry>
+ showRemoveTopStoryButton="true"/>
</xp:repeat>
</xp:panel>
@@ -30,18 +30,17 @@
<br />
<xp:text tagName="h4" styleClass="" value="#{category.displayName}"/>
<br />
- <xp:repeat id="r2epeadfat3" var="entryMTC" rows="10" value="#{javascript:newsCache.getTopStories(category.getID())}">
+ <xp:repeat id="r2epeadfat3" var="entryMTC" rows="10" value="#{pageController.categoryTopStories}">
<xc:moderationNewsEntry id="ndiflkjm"
link="#{entryMTC.link}"
nID="#{entryMTC.ID}"
- personDisplayName="#{javascript:personsCache.getPerson(entryMTC.getPID()).getDisplayName()}"
+ personDisplayName="#{pageController.categoryStoryPerson.displayName}"
publicationDate="#{entryMTC.prettyTime}"
title="#{entryMTC.title}"
state="#{entryMTC.state}"
clicksTotal="#{entryMTC.clicksTotal}"
clicksLastWeek="#{entryMTC.clicksLastWeek}"
- showRemoveTopStoryButton="yes">
- </xc:moderationNewsEntry>
+ showRemoveTopStoryButton="true"/>
</xp:repeat>
</xp:repeat>
</xc:moderationLayout>
View
16 disk-collaborationtoday/XPages/modTopStories.xsp.metadata
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?><note class="form" maintenanceversion="3.0" replicaid="85257AA6004F5595" version="8.5" xmlns="http://www.lotus.com/dxl">
-<noteinfo noteid="186" sequence="18" unid="08A1D82E94A727F685257AA6004F5ACA">
-<created><datetime dst="true">20121029T102645,86-04</datetime></created>
-<modified><datetime dst="true">20121030T153313,32-04</datetime></modified>
-<revised><datetime dst="true">20121030T153313,30-04</datetime></revised>
-<lastaccessed><datetime dst="true">20121030T153313,30-04</datetime></lastaccessed>
-<addedtofile><datetime dst="true">20121029T102645,93-04</datetime></addedtofile></noteinfo>
+<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257B60005F94A2" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="18e" sequence="8" unid="A9BB178480B460FD85257B60005F9A32">
+<created><datetime dst="true">20130503T132413,94-04</datetime></created>
+<modified><datetime dst="true">20130503T153255,31-04</datetime></modified>
+<revised><datetime dst="true">20130503T153255,29-04</datetime></revised>
+<lastaccessed><datetime dst="true">20130503T153255,29-04</datetime></lastaccessed>
+<addedtofile><datetime dst="true">20130503T132413,99-04</datetime></addedtofile></noteinfo>
<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
<item name="$Flags"><text>gC~4K</text></item>
<item name="$TITLE" sign="true"><text>modTopStories.xsp</text></item>
-
<item name="$Comment" sign="true"><text>Moderators Only</text></item>
<item name="$DesignerVersion"><text>8.5.2</text></item>
@@ -18,4 +17,5 @@
+
<item name="$FileNames" sign="true"><text>modTopStories.xsp</text></item></note>