You can subscribe to this list here.
2008 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(5) |
Jun
(4) |
Jul
|
Aug
(34) |
Sep
(15) |
Oct
|
Nov
|
Dec
(2) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2009 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <kas...@us...> - 2009-01-21 08:15:08
|
Revision: 84 http://aconix.svn.sourceforge.net/aconix/?rev=84&view=rev Author: kaskuers Date: 2009-01-21 08:15:06 +0000 (Wed, 21 Jan 2009) Log Message: ----------- Modified Paths: -------------- trunk/src/java/org/blueoxygen/aconix/frontpage/action/ViewDetail.java trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java trunk/src/template/view/frontpage/index.vm Modified: trunk/src/java/org/blueoxygen/aconix/frontpage/action/ViewDetail.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/frontpage/action/ViewDetail.java 2008-12-11 05:15:00 UTC (rev 83) +++ trunk/src/java/org/blueoxygen/aconix/frontpage/action/ViewDetail.java 2009-01-21 08:15:06 UTC (rev 84) @@ -105,11 +105,11 @@ } } articles = manager.getList("SELECT l FROM " + Article.class.getName() - + " l WHERE l.id='" + getId() + + " l WHERE l.categoryId.id='" + getId() + "' AND l.logInformation.activeFlag='1'", null, null); - //artAc = (ArticleCategory) manager.getById(ArticleCategory.class, - // getId()); - //cat = artAc.getName(); + artAc = (ArticleCategory) manager.getById(ArticleCategory.class, + getId()); + cat = artAc.getName(); System.out.println(articles); if (!articles.isEmpty()) { for (Article e : articles) { Modified: trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java 2008-12-11 05:15:00 UTC (rev 83) +++ trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java 2009-01-21 08:15:06 UTC (rev 84) @@ -82,6 +82,7 @@ } for(int x = 0; x < y.size() ; x++){ String cat = (String) y.get(x); + System.out.println(cat); category = (ArticleCategory) getManager().getById(ArticleCategory.class, cat); artCat.add(category.getName()); } Modified: trunk/src/template/view/frontpage/index.vm =================================================================== --- trunk/src/template/view/frontpage/index.vm 2008-12-11 05:15:00 UTC (rev 83) +++ trunk/src/template/view/frontpage/index.vm 2009-01-21 08:15:06 UTC (rev 84) @@ -97,10 +97,11 @@ #foreach($e in $ord.get($r)) <tr bgcolor="#ffffff"> - <td><strong><font size="3">$e</font></strong></td> + #set($no = $velocityCount - 1) + <td><strong><font size="3"><a href="../frontpage/detail.action?id=$ord3.get($r).get($no)&name=$nameDesc&pCol.name=index">$e</a></font></strong></td> </tr> <tr bgcolor="#ffffff"> - #set($no = $velocityCount - 1) + <td>Posted By: $ord5.get($r).get($no) Category : $ord4.get($r).get($no) at : $ord2.get($r).get($no)</td> </tr> <tr bgcolor="#ffffff"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kas...@us...> - 2008-12-11 05:15:03
|
Revision: 83 http://aconix.svn.sourceforge.net/aconix/?rev=83&view=rev Author: kaskuers Date: 2008-12-11 05:15:00 +0000 (Thu, 11 Dec 2008) Log Message: ----------- patching bug for view at frontpage Modified Paths: -------------- trunk/src/java/org/blueoxygen/aconix/frontpage/action/ViewDetail.java Modified: trunk/src/java/org/blueoxygen/aconix/frontpage/action/ViewDetail.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/frontpage/action/ViewDetail.java 2008-12-02 04:21:53 UTC (rev 82) +++ trunk/src/java/org/blueoxygen/aconix/frontpage/action/ViewDetail.java 2008-12-11 05:15:00 UTC (rev 83) @@ -105,11 +105,11 @@ } } articles = manager.getList("SELECT l FROM " + Article.class.getName() - + " l WHERE l.categoryId.id='" + getId() + + " l WHERE l.id='" + getId() + "' AND l.logInformation.activeFlag='1'", null, null); - artAc = (ArticleCategory) manager.getById(ArticleCategory.class, - getId()); - cat = artAc.getName(); + //artAc = (ArticleCategory) manager.getById(ArticleCategory.class, + // getId()); + //cat = artAc.getName(); System.out.println(articles); if (!articles.isEmpty()) { for (Article e : articles) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kas...@us...> - 2008-12-02 04:21:57
|
Revision: 82 http://aconix.svn.sourceforge.net/aconix/?rev=82&view=rev Author: kaskuers Date: 2008-12-02 04:21:53 +0000 (Tue, 02 Dec 2008) Log Message: ----------- patch aconix revision on edit.vm for collection Modified Paths: -------------- trunk/src/java/org/blueoxygen/aconix/collection/action/CollectionForm.java trunk/src/template/view/module/aconix/collection/result.vm Modified: trunk/src/java/org/blueoxygen/aconix/collection/action/CollectionForm.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/collection/action/CollectionForm.java 2008-09-25 02:09:22 UTC (rev 81) +++ trunk/src/java/org/blueoxygen/aconix/collection/action/CollectionForm.java 2008-12-02 04:21:53 UTC (rev 82) @@ -32,12 +32,21 @@ private String vm=""; private String moduleDescriptorId = ""; private String moduleDescriptorName=""; + private String key=""; public String execute(){ if(getCollection().getId() == null){ }else{ + /*selectedDetails = getManager().getList("SELECT y FROM "+CollectionSelectedDetail.class.getName()+" y WHERE y.id='"+getCollection().getId()+"'", null, null); + if(!selectedDetails.isEmpty()){ + setKey("1"); + setSelectedDetail((CollectionSelectedDetail) getManager().getById(CollectionSelectedDetail.class, getCollection().getId())); + }else { + setKey("2"); + setCollectionDescriptor((CollectionDescriptor) getManager().getById(CollectionDescriptor.class, getCollection().getId())); + }*/ setCollection((ACollection) getManager().getById(ACollection.class, getCollection().getId())); } setMsg("Add"); @@ -205,6 +214,15 @@ this.vm = vm; } + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + } Modified: trunk/src/template/view/module/aconix/collection/result.vm =================================================================== --- trunk/src/template/view/module/aconix/collection/result.vm 2008-09-25 02:09:22 UTC (rev 81) +++ trunk/src/template/view/module/aconix/collection/result.vm 2008-12-02 04:21:53 UTC (rev 82) @@ -40,7 +40,7 @@ #foreach($SelDel in $selectedDetails) <tr bgcolor="#ffffff"> <td>$!SelDel.collection.name</td> - <td><a href="../collection/edit.action?collection.id=$SelDel" title="Edit"><img src="../../images/silk/page_edit.png" border="0"></a> <a href="../collection/delete.action?collection.id=$SelDel" title="Delete"><img src="../../images/silk/delete.png" border="0"></a></td> + <td><a href="../collection/edit.action?collection.id=$SelDel.collection.id" title="Edit"><img src="../../images/silk/page_edit.png" border="0"></a> <a href="../collection/delete.action?collection.id=$SelDel.collection.id" title="Delete"><img src="../../images/silk/delete.png" border="0"></a></td> </tr> #end #end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pir...@us...> - 2008-09-25 02:09:38
|
Revision: 81 http://aconix.svn.sourceforge.net/aconix/?rev=81&view=rev Author: pirate_153 Date: 2008-09-25 02:09:22 +0000 (Thu, 25 Sep 2008) Log Message: ----------- Aconix-1.0.1 Modified Paths: -------------- trunk/src/config/struts-aconix.xml trunk/src/java/org/blueoxygen/aconix/article/action/ArticleForm.java trunk/src/java/org/blueoxygen/aconix/articleCategory/action/ArticleCategoryForm.java trunk/src/java/org/blueoxygen/aconix/articleCategory/action/SearchArticleCategory.java trunk/src/java/org/blueoxygen/aconix/collection/action/CollectionForm.java trunk/src/java/org/blueoxygen/aconix/collection/action/ListCollection.java trunk/src/java/org/blueoxygen/aconix/collection/action/ListOrdered.java trunk/src/java/org/blueoxygen/aconix/collection/action/OrderedCollection.java trunk/src/java/org/blueoxygen/aconix/collection/action/SearchCollection.java trunk/src/java/org/blueoxygen/aconix/collection/action/SelectedCollection.java trunk/src/java/org/blueoxygen/aconix/entity/ACollection.java trunk/src/java/org/blueoxygen/aconix/entity/Article.java trunk/src/java/org/blueoxygen/aconix/entity/ArticleCategory.java trunk/src/java/org/blueoxygen/aconix/entity/CollectionDescriptor.java trunk/src/java/org/blueoxygen/aconix/entity/CollectionSelectedDetail.java trunk/src/java/org/blueoxygen/aconix/entity/PageCollection.java trunk/src/java/org/blueoxygen/aconix/entity/PageCollectionDetail.java trunk/src/java/org/blueoxygen/aconix/frontpage/action/ViewDetail.java trunk/src/java/org/blueoxygen/aconix/pageCollection/action/AddPageCollection.java trunk/src/java/org/blueoxygen/aconix/pageCollection/action/PageCollectionForm.java trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Search.java Added Paths: ----------- trunk/src/java/org/blueoxygen/aconix/article/action/ListArticle.java trunk/src/java/org/blueoxygen/aconix/collection/action/Down.java trunk/src/java/org/blueoxygen/aconix/collection/action/EditCollection.java trunk/src/java/org/blueoxygen/aconix/collection/action/Up.java trunk/src/sql/aconix-1.1-export.xml trunk/src/sql/aconix.sql Removed Paths: ------------- trunk/src/java/org/blueoxygen/aconix/article/action/listArticle.java trunk/src/java/org/blueoxygen/aconix/collection/action/down.java trunk/src/java/org/blueoxygen/aconix/collection/action/editCollection.java trunk/src/java/org/blueoxygen/aconix/collection/action/up.java Modified: trunk/src/config/struts-aconix.xml =================================================================== --- trunk/src/config/struts-aconix.xml 2008-09-14 01:15:01 UTC (rev 80) +++ trunk/src/config/struts-aconix.xml 2008-09-25 02:09:22 UTC (rev 81) @@ -31,10 +31,10 @@ <action name="EditContent" class="org.blueoxygen.aconix.collection.action.SelectedCollection" method="EditContent"> <result name="success" type="velocity">/view/module/aconix/collection/editSelected.vm</result> </action> - <action name="up" class="org.blueoxygen.aconix.collection.action.up"> + <action name="up" class="org.blueoxygen.aconix.collection.action.Up"> <result name="success" type="velocity">/view/module/aconix/collection/editSelected.vm</result> </action> - <action name="down" class="org.blueoxygen.aconix.collection.action.down"> + <action name="down" class="org.blueoxygen.aconix.collection.action.Down"> <result name="success" type="velocity">/view/module/aconix/collection/editSelected.vm</result> </action> <action name="filter" class="org.blueoxygen.aconix.collection.action.CollectionForm"> @@ -58,7 +58,7 @@ <action name="summary" class="org.blueoxygen.aconix.collection.action.CollectionForm"> <result name="success" type="velocity">/view/module/aconix/collection/success.vm</result> </action> - <action name="EditSelectedContent" class="org.blueoxygen.aconix.collection.action.editCollection"> + <action name="EditSelectedContent" class="org.blueoxygen.aconix.collection.action.EditCollection"> <result name="success" type="velocity">/view/module/aconix/collection/editSelected.vm</result> </action> <action name="order" class="org.blueoxygen.aconix.collection.action.OrderedCollection"> @@ -74,7 +74,7 @@ <action name="DeleteOrderedContent" class="org.blueoxygen.aconix.collection.action.OrderedCollection" method="DeleteOrderedContent"> <result name="success" type="velocity">/view/module/aconix/collection/OrderedCollection.vm</result> </action> - <action name="EditOrdered" class="org.blueoxygen.aconix.collection.action.editCollection" method="editOrdered"> + <action name="EditOrdered" class="org.blueoxygen.aconix.collection.action.EditCollection" method="editOrdered"> <result name="success" type="velocity">/view/module/aconix/collection/OrderedCollection.vm</result> </action> <action name="listOrdered" class="org.blueoxygen.aconix.collection.action.ListOrdered"> @@ -110,7 +110,7 @@ <action name="delete" class="org.blueoxygen.aconix.article.action.DeleteArticle"> <result name="success" type="velocity">/view/module/aconix/article/success.vm</result> </action> - <action name="listArticle" class="org.blueoxygen.aconix.article.action.listArticle"> + <action name="listArticle" class="org.blueoxygen.aconix.article.action.ListArticle"> <result name="success" type="velocity">/view/module/aconix/article/listArticle.vm</result> </action> </package> Modified: trunk/src/java/org/blueoxygen/aconix/article/action/ArticleForm.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/article/action/ArticleForm.java 2008-09-14 01:15:01 UTC (rev 80) +++ trunk/src/java/org/blueoxygen/aconix/article/action/ArticleForm.java 2008-09-25 02:09:22 UTC (rev 81) @@ -12,8 +12,6 @@ import org.blueoxygen.cimande.persistence.PersistenceAware; import org.blueoxygen.cimande.persistence.PersistenceManager; -import com.opensymphony.xwork2.ActionSupport; - /** * @author SiLeNT~SkY * Copied: trunk/src/java/org/blueoxygen/aconix/article/action/ListArticle.java (from rev 80, trunk/src/java/org/blueoxygen/aconix/article/action/listArticle.java) =================================================================== --- trunk/src/java/org/blueoxygen/aconix/article/action/ListArticle.java (rev 0) +++ trunk/src/java/org/blueoxygen/aconix/article/action/ListArticle.java 2008-09-25 02:09:22 UTC (rev 81) @@ -0,0 +1,204 @@ +/** + * + */ +package org.blueoxygen.aconix.article.action; + +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; + +import org.blueoxygen.cimande.CimandeAction; +import org.blueoxygen.cimande.descriptors.Descriptor; +import org.blueoxygen.cimande.persistence.PersistenceAware; +import org.blueoxygen.cimande.persistence.PersistenceManager; +import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactory; +import org.hibernate.HibernateException; + +/** + * @author SiLeNT~SkY + * + */ +public class ListArticle extends CimandeAction implements PersistenceAware { + private HibernateSessionFactory hsf; + private PersistenceManager manager; + protected Descriptor descriptor = new Descriptor(); + protected List<Descriptor> descriptors = new ArrayList<Descriptor>(); + private String name=""; + private String[] input; + private int index; + private List dftr = new ArrayList(); + private List dtr = new ArrayList(); + + + public String execute(){ + System.out.println(getName()); + if(!"".equalsIgnoreCase(getName()) && getName() != null){ + descriptor = (Descriptor) getManager().getById(Descriptor.class, getName()); + System.out.println(descriptor.getName()); + try { + ResultSet con = hsf.createSession().connection().createStatement().executeQuery("SELECT * FROM "+descriptor.getName()); + while(con.next()){ + String w = con.getString("name"); + String c = con.getString("id"); + dftr.add(w); + dtr.add(c); + + index = con.getRow(); + + } + } catch (HibernateException e) { + e.printStackTrace(); + } catch (SQLException e) { + e.printStackTrace(); + } + System.out.println(dtr); + System.out.println(dftr); + + } + return SUCCESS; + + } + + + + + /** + * @return the index + */ + public int getIndex() { + return index; + } + + + + + /** + * @param index the index to set + */ + public void setIndex(int index) { + this.index = index; + } + + + + + /** + * @return the dtr + */ + public List getDtr() { + return dtr; + } + + + + + /** + * @param dtr the dtr to set + */ + public void setDtr(List dtr) { + this.dtr = dtr; + } + + + + + /** + * @return the dftr + */ + public List getDftr() { + return dftr; + } + + + + + /** + * @param dftr the dftr to set + */ + public void setDftr(List dftr) { + this.dftr = dftr; + } + + + + + public void setPersistenceManager(PersistenceManager manager) { + this.manager = manager; + + } + + + /** + * @return the hsf + */ + public HibernateSessionFactory getHsf() { + return hsf; + } + + /** + * @param hsf the hsf to set + */ + public void setHsf(HibernateSessionFactory hsf) { + this.hsf = hsf; + } + + /** + * @return the descriptors + */ + public List<Descriptor> getDescriptors() { + return descriptors; + } + + /** + * @param descriptors the descriptors to set + */ + public void setDescriptors(List<Descriptor> descriptors) { + this.descriptors = descriptors; + } + + + /** + * @return the descriptor + */ + public Descriptor getDescriptor() { + return descriptor; + } + + /** + * @param descriptor the descriptor to set + */ + public void setDescriptor(Descriptor descriptor) { + this.descriptor = descriptor; + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } + + /** + * @return the manager + */ + public PersistenceManager getManager() { + return manager; + } + + /** + * @param manager the manager to set + */ + public void setManager(PersistenceManager manager) { + this.manager = manager; + } + + +} Property changes on: trunk/src/java/org/blueoxygen/aconix/article/action/ListArticle.java ___________________________________________________________________ Added: svn:mergeinfo + Deleted: trunk/src/java/org/blueoxygen/aconix/article/action/listArticle.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/article/action/listArticle.java 2008-09-14 01:15:01 UTC (rev 80) +++ trunk/src/java/org/blueoxygen/aconix/article/action/listArticle.java 2008-09-25 02:09:22 UTC (rev 81) @@ -1,208 +0,0 @@ -/** - * - */ -package org.blueoxygen.aconix.article.action; - -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.blueoxygen.aconix.entity.Article; -import org.blueoxygen.cimande.CimandeAction; -import org.blueoxygen.cimande.descriptors.Descriptor; -import org.blueoxygen.cimande.persistence.PersistenceAware; -import org.blueoxygen.cimande.persistence.PersistenceManager; -import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactory; -import org.hibernate.HibernateException; - -import com.opensymphony.xwork2.ActionSupport; - -/** - * @author SiLeNT~SkY - * - */ -public class listArticle extends CimandeAction implements PersistenceAware { - private HibernateSessionFactory hsf; - private PersistenceManager manager; - protected Descriptor descriptor = new Descriptor(); - protected List<Descriptor> descriptors = new ArrayList<Descriptor>(); - private String name=""; - private String[] input; - private int index; - private List dftr = new ArrayList(); - private List dtr = new ArrayList(); - - - public String execute(){ - System.out.println(getName()); - if(!"".equalsIgnoreCase(getName()) && getName() != null){ - descriptor = (Descriptor) getManager().getById(Descriptor.class, getName()); - System.out.println(descriptor.getName()); - try { - ResultSet con = hsf.createSession().connection().createStatement().executeQuery("SELECT * FROM "+descriptor.getName()); - while(con.next()){ - String w = con.getString("name"); - String c = con.getString("id"); - dftr.add(w); - dtr.add(c); - - index = con.getRow(); - - } - } catch (HibernateException e) { - e.printStackTrace(); - } catch (SQLException e) { - e.printStackTrace(); - } - System.out.println(dtr); - System.out.println(dftr); - - } - return SUCCESS; - - } - - - - - /** - * @return the index - */ - public int getIndex() { - return index; - } - - - - - /** - * @param index the index to set - */ - public void setIndex(int index) { - this.index = index; - } - - - - - /** - * @return the dtr - */ - public List getDtr() { - return dtr; - } - - - - - /** - * @param dtr the dtr to set - */ - public void setDtr(List dtr) { - this.dtr = dtr; - } - - - - - /** - * @return the dftr - */ - public List getDftr() { - return dftr; - } - - - - - /** - * @param dftr the dftr to set - */ - public void setDftr(List dftr) { - this.dftr = dftr; - } - - - - - public void setPersistenceManager(PersistenceManager manager) { - this.manager = manager; - - } - - - /** - * @return the hsf - */ - public HibernateSessionFactory getHsf() { - return hsf; - } - - /** - * @param hsf the hsf to set - */ - public void setHsf(HibernateSessionFactory hsf) { - this.hsf = hsf; - } - - /** - * @return the descriptors - */ - public List<Descriptor> getDescriptors() { - return descriptors; - } - - /** - * @param descriptors the descriptors to set - */ - public void setDescriptors(List<Descriptor> descriptors) { - this.descriptors = descriptors; - } - - - /** - * @return the descriptor - */ - public Descriptor getDescriptor() { - return descriptor; - } - - /** - * @param descriptor the descriptor to set - */ - public void setDescriptor(Descriptor descriptor) { - this.descriptor = descriptor; - } - - /** - * @return the name - */ - public String getName() { - return name; - } - - /** - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } - - /** - * @return the manager - */ - public PersistenceManager getManager() { - return manager; - } - - /** - * @param manager the manager to set - */ - public void setManager(PersistenceManager manager) { - this.manager = manager; - } - - -} Modified: trunk/src/java/org/blueoxygen/aconix/articleCategory/action/ArticleCategoryForm.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/articleCategory/action/ArticleCategoryForm.java 2008-09-14 01:15:01 UTC (rev 80) +++ trunk/src/java/org/blueoxygen/aconix/articleCategory/action/ArticleCategoryForm.java 2008-09-25 02:09:22 UTC (rev 81) @@ -11,8 +11,6 @@ import org.blueoxygen.cimande.persistence.PersistenceAware; import org.blueoxygen.cimande.persistence.PersistenceManager; -import com.opensymphony.xwork2.ActionSupport; - /** * @author heaven * Modified: trunk/src/java/org/blueoxygen/aconix/articleCategory/action/SearchArticleCategory.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/articleCategory/action/SearchArticleCategory.java 2008-09-14 01:15:01 UTC (rev 80) +++ trunk/src/java/org/blueoxygen/aconix/articleCategory/action/SearchArticleCategory.java 2008-09-25 02:09:22 UTC (rev 81) @@ -4,7 +4,6 @@ package org.blueoxygen.aconix.articleCategory.action; import java.sql.SQLException; -import java.util.ArrayList; import org.blueoxygen.aconix.entity.ArticleCategory; import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactory; @@ -49,7 +48,7 @@ maxPage = resultRows / maxRowPerPage; if (resultRows % maxRowPerPage == 0) maxPage = maxPage - 1; - setACategories((ArrayList<ArticleCategory>)crit.addOrder(Order.asc(orderBy)) + setACategories(crit.addOrder(Order.asc(orderBy)) .setFirstResult(currPage * maxRowPerPage) .setMaxResults(maxRowPerPage) .list()); Modified: trunk/src/java/org/blueoxygen/aconix/collection/action/CollectionForm.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/collection/action/CollectionForm.java 2008-09-14 01:15:01 UTC (rev 80) +++ trunk/src/java/org/blueoxygen/aconix/collection/action/CollectionForm.java 2008-09-25 02:09:22 UTC (rev 81) @@ -3,28 +3,18 @@ */ package org.blueoxygen.aconix.collection.action; -import java.lang.reflect.InvocationTargetException; -import java.sql.Timestamp; import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; import java.util.List; -import java.util.Set; import org.blueoxygen.aconix.entity.ACollection; import org.blueoxygen.aconix.entity.CollectionDescriptor; import org.blueoxygen.aconix.entity.CollectionSelectedDetail; import org.blueoxygen.cimande.CimandeAction; -import org.blueoxygen.cimande.DefaultPersistence; -import org.blueoxygen.cimande.LogInformation; import org.blueoxygen.cimande.persistence.PersistenceAware; import org.blueoxygen.cimande.persistence.PersistenceManager; import org.blueoxygen.cimande.security.SessionCredentials; import org.blueoxygen.cimande.security.SessionCredentialsAware; -import org.apache.commons.beanutils.*; -import com.opensymphony.xwork2.ActionSupport; - /** * @author SiLeNT~SkY * Copied: trunk/src/java/org/blueoxygen/aconix/collection/action/Down.java (from rev 80, trunk/src/java/org/blueoxygen/aconix/collection/action/down.java) =================================================================== --- trunk/src/java/org/blueoxygen/aconix/collection/action/Down.java (rev 0) +++ trunk/src/java/org/blueoxygen/aconix/collection/action/Down.java 2008-09-25 02:09:22 UTC (rev 81) @@ -0,0 +1,292 @@ +/** + * + */ +package org.blueoxygen.aconix.collection.action; + +import java.sql.SQLException; + +import org.blueoxygen.aconix.entity.ACollection; +import org.blueoxygen.aconix.entity.CollectionSelectedDetail; +import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactory; +import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactoryAware; +import org.hibernate.Criteria; +import org.hibernate.HibernateException; +import org.hibernate.classic.Session; +import org.hibernate.criterion.Expression; +import org.hibernate.criterion.MatchMode; +import org.hibernate.criterion.Order; + +/** + * @author heaven + * + */ +public class Down extends CollectionForm implements HibernateSessionFactoryAware { + private HibernateSessionFactory hsf; + private Session sess; + private String moduleDescriptorId = ""; + private String moduleDescriptorDescription = ""; + private String id = ""; + private int olderRank; + private int NewerRank; + private int tempRank; + private String tempId = ""; + private String vm=""; + private String articleId = ""; + private String articleDescription = ""; + + private int maxPage; + private int currPage; + private int nextPage; + private int page; + private int prevPage = 0; + private int maxRowPerPage = 10; + private String orderBy = "rank"; + private int resultRows; + + public String execute(){ + setCollection((ACollection) getManager().getById(ACollection.class, getCollection().getId())); + if (getId() != null) { + setSelectedDetail((CollectionSelectedDetail) getManager().getById( + CollectionSelectedDetail.class, getId())); + + tempId = getSelectedDetail().getCollection().getId(); + tempRank = getSelectedDetail().getRank(); + + moduleDescriptorId = getSelectedDetail().getDescriptor().getId(); + moduleDescriptorDescription = getSelectedDetail().getDescriptor().getName(); + + NewerRank = tempRank+1; + getSelectedDetail().setRank(NewerRank); + + } + setSelectedDetails(getManager().getList("FROM "+CollectionSelectedDetail.class.getName()+" e WHERE e.collection.id='"+tempId+"' AND e.rank='"+NewerRank+"'", null, null)); + for(CollectionSelectedDetail csd : getSelectedDetails()){ + csd.setRank(tempRank); + getManager().save(csd); + } + + + sess = hsf.createSession(); + Criteria crit = sess.createCriteria(CollectionSelectedDetail.class); + + if(!"".equals(getCollection().getId())){ + crit.add(Expression.like("collection.id", getCollection().getId() , MatchMode.ANYWHERE)); + } + + resultRows = crit.list().size(); + maxPage = resultRows / maxRowPerPage; + if (resultRows % maxRowPerPage == 0) maxPage = maxPage - 1; + + setSelectedDetails(crit.addOrder(Order.asc(orderBy)) + .setFirstResult(currPage * maxRowPerPage) + .setMaxResults(maxRowPerPage) + .list()); + + prevPage = currPage - 1; + nextPage = currPage + 1; + page = currPage + 1 ; + + + try { + hsf.endSession(sess); + } catch (HibernateException e) { + e.printStackTrace(); + } catch (SQLException e) { + e.printStackTrace(); + } + vm = getVm(); + setId(""); + return SUCCESS; + } + + /** + * @return the articleDescription + */ + public String getArticleDescription() { + return articleDescription; + } + + /** + * @param articleDescription the articleDescription to set + */ + public void setArticleDescription(String articleDescription) { + this.articleDescription = articleDescription; + } + + /** + * @return the id + */ + public String getId() { + return id; + } + + /** + * @param id the id to set + */ + public void setId(String id) { + this.id = id; + } + + + /** + * @return the maxPage + */ + public int getMaxPage() { + return maxPage; + } + + /** + * @param maxPage the maxPage to set + */ + public void setMaxPage(int maxPage) { + this.maxPage = maxPage; + } + + /** + * @return the currPage + */ + public int getCurrPage() { + return currPage; + } + + /** + * @param currPage the currPage to set + */ + public void setCurrPage(int currPage) { + this.currPage = currPage; + } + + /** + * @return the nextPage + */ + public int getNextPage() { + return nextPage; + } + + /** + * @param nextPage the nextPage to set + */ + public void setNextPage(int nextPage) { + this.nextPage = nextPage; + } + + /** + * @return the page + */ + public int getPage() { + return page; + } + + /** + * @param page the page to set + */ + public void setPage(int page) { + this.page = page; + } + + /** + * @return the prevPage + */ + public int getPrevPage() { + return prevPage; + } + + /** + * @param prevPage the prevPage to set + */ + public void setPrevPage(int prevPage) { + this.prevPage = prevPage; + } + + /** + * @return the maxRowPerPage + */ + public int getMaxRowPerPage() { + return maxRowPerPage; + } + + /** + * @param maxRowPerPage the maxRowPerPage to set + */ + public void setMaxRowPerPage(int maxRowPerPage) { + this.maxRowPerPage = maxRowPerPage; + } + + /** + * @return the orderBy + */ + public String getOrderBy() { + return orderBy; + } + + /** + * @param orderBy the orderBy to set + */ + public void setOrderBy(String orderBy) { + this.orderBy = orderBy; + } + + /** + * @return the resultRows + */ + public int getResultRows() { + return resultRows; + } + + /** + * @param resultRows the resultRows to set + */ + public void setResultRows(int resultRows) { + this.resultRows = resultRows; + } + public void setHibernateSessionFactory(HibernateSessionFactory hsf) { + this.hsf = hsf; + } + + /** + * @return the moduleDescriptorId + */ + public String getModuleDescriptorId() { + return moduleDescriptorId; + } + + /** + * @param moduleDescriptorId the moduleDescriptorId to set + */ + public void setModuleDescriptorId(String moduleDescriptorId) { + this.moduleDescriptorId = moduleDescriptorId; + } + + /** + * @return the moduleDescriptorDescription + */ + public String getModuleDescriptorDescription() { + return moduleDescriptorDescription; + } + + /** + * @param moduleDescriptorDescription the moduleDescriptorDescription to set + */ + public void setModuleDescriptorDescription(String moduleDescriptorDescription) { + this.moduleDescriptorDescription = moduleDescriptorDescription; + } + + /** + * @return the vm + */ + public String getVm() { + return vm; + } + + /** + * @param vm the vm to set + */ + public void setVm(String vm) { + this.vm = vm; + } + + + + + +} Property changes on: trunk/src/java/org/blueoxygen/aconix/collection/action/Down.java ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/src/java/org/blueoxygen/aconix/collection/action/EditCollection.java (from rev 80, trunk/src/java/org/blueoxygen/aconix/collection/action/editCollection.java) =================================================================== --- trunk/src/java/org/blueoxygen/aconix/collection/action/EditCollection.java (rev 0) +++ trunk/src/java/org/blueoxygen/aconix/collection/action/EditCollection.java 2008-09-25 02:09:22 UTC (rev 81) @@ -0,0 +1,321 @@ +/** + * + */ +package org.blueoxygen.aconix.collection.action; + +import java.sql.SQLException; + +import org.blueoxygen.aconix.entity.ACollection; +import org.blueoxygen.aconix.entity.CollectionDescriptor; +import org.blueoxygen.aconix.entity.CollectionSelectedDetail; +import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactory; +import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactoryAware; +import org.hibernate.Criteria; +import org.hibernate.HibernateException; +import org.hibernate.classic.Session; +import org.hibernate.criterion.Expression; +import org.hibernate.criterion.MatchMode; +import org.hibernate.criterion.Order; + +/** + * @author SiLeNT~SkY + * + */ +public class EditCollection extends CollectionForm implements HibernateSessionFactoryAware { + private String id = ""; + private String moduleDescriptorId = ""; + private String moduleDescriptorDescription = ""; + private String articleId = ""; + private String articleDescription = ""; + private String collection_id = ""; + private String collectionId = ""; + private int limit; + + private HibernateSessionFactory hsf; + private Session sess; + private int maxPage; + private int currPage; + private int nextPage; + private int page; + private int prevPage = 0; + private int maxRowPerPage = 10; + private String orderBy = "collection.id"; + private int resultRows; + + public String execute(){ + if(!"".equalsIgnoreCase(getCollection_id())){ + setCollection((ACollection) getManager().getById(ACollection.class, getCollection_id())); + } + if(!"".equalsIgnoreCase(getId())){ + setSelectedDetail((CollectionSelectedDetail) getManager().getById(CollectionSelectedDetail.class, getId())); + + setModuleDescriptorId(getSelectedDetail().getDescriptor().getId()); + } + + + sess = hsf.createSession(); + Criteria crit = sess.createCriteria(CollectionSelectedDetail.class); + + if(!"".equals(getCollection().getId())){ + crit.add(Expression.like("collection.id", getCollection().getId() , MatchMode.ANYWHERE)); + } + + resultRows = crit.list().size(); + maxPage = resultRows / maxRowPerPage; + if (resultRows % maxRowPerPage == 0) maxPage = maxPage - 1; + + setSelectedDetails(crit.addOrder(Order.asc(orderBy)) + .setFirstResult(currPage * maxRowPerPage) + .setMaxResults(maxRowPerPage) + .list()); + + prevPage = currPage - 1; + nextPage = currPage + 1; + page = currPage + 1 ; + + + try { + hsf.endSession(sess); + } catch (HibernateException e) { + e.printStackTrace(); + } catch (SQLException e) { + e.printStackTrace(); + } + + setCollection_id(getCollection().getId()); + setId(getId()); + return SUCCESS; + } + public String editOrdered(){ + if(!"".equalsIgnoreCase(getCollection().getId())){ + setCollection((ACollection) getManager().getById(ACollection.class, getCollection().getId())); + } + if(!"".equalsIgnoreCase(getId())){ + setCollectionDescriptor((CollectionDescriptor) getManager().getById(CollectionDescriptor.class, getId())); + setLimit(getCollectionDescriptor().getLimitValue()); + setModuleDescriptorId(getCollectionDescriptor().getDescriptor().getId()); + setModuleDescriptorDescription(getCollectionDescriptor().getDescriptor().getDescription()); + + + } + + sess = hsf.createSession(); + Criteria crit = sess.createCriteria(CollectionDescriptor.class); + + if(!"".equals(getCollection_id())){ + crit.add(Expression.like("collection.id", getCollection_id() , MatchMode.ANYWHERE)); + } + + resultRows = crit.list().size(); + maxPage = resultRows / maxRowPerPage; + if (resultRows % maxRowPerPage == 0) maxPage = maxPage - 1; + + setCollectionDescriptors(crit.addOrder(Order.asc(orderBy)) + .setFirstResult(currPage * maxRowPerPage) + .setMaxResults(maxRowPerPage) + .list()); + + prevPage = currPage - 1; + nextPage = currPage + 1; + page = currPage + 1 ; + + + try { + hsf.endSession(sess); + } catch (HibernateException e) { + e.printStackTrace(); + } catch (SQLException e) { + e.printStackTrace(); + } + + setCollection_id(getCollection().getId()); + setId(getId()); + return SUCCESS; + } + + /** + * @return the id + */ + public String getId() { + return id; + } + + /** + * @param id the id to set + */ + public void setId(String id) { + this.id = id; + } + + /** + * @return the moduleDescriptorId + */ + public String getModuleDescriptorId() { + return moduleDescriptorId; + } + + /** + * @param moduleDescriptorId the moduleDescriptorId to set + */ + public void setModuleDescriptorId(String moduleDescriptorId) { + this.moduleDescriptorId = moduleDescriptorId; + } + + /** + * @return the moduleDescriptorDescription + */ + public String getModuleDescriptorDescription() { + return moduleDescriptorDescription; + } + + /** + * @param moduleDescriptorDescription the moduleDescriptorDescription to set + */ + public void setModuleDescriptorDescription(String moduleDescriptorDescription) { + this.moduleDescriptorDescription = moduleDescriptorDescription; + } + + /** + * @return the articleId + */ + public String getArticleId() { + return articleId; + } + + /** + * @param articleId the articleId to set + */ + public void setArticleId(String articleId) { + this.articleId = articleId; + } + + /** + * @return the articleDescription + */ + public String getArticleDescription() { + return articleDescription; + } + + /** + * @param articleDescription the articleDescription to set + */ + public void setArticleDescription(String articleDescription) { + this.articleDescription = articleDescription; + } + + /** + * @return the collection_id + */ + public String getCollection_id() { + return collection_id; + } + + /** + * @param collection_id the collection_id to set + */ + public void setCollection_id(String collection_id) { + this.collection_id = collection_id; + } + + /** + * @return the collectionId + */ + public String getCollectionId() { + return collectionId; + } + + /** + * @param collectionId the collectionId to set + */ + public void setCollectionId(String collectionId) { + this.collectionId = collectionId; + } + + + public int getMaxPage() { + return maxPage; + } + + public void setMaxPage(int maxPage) { + this.maxPage = maxPage; + } + + public int getCurrPage() { + return currPage; + } + + public void setCurrPage(int currPage) { + this.currPage = currPage; + } + + public int getNextPage() { + return nextPage; + } + + public void setNextPage(int nextPage) { + this.nextPage = nextPage; + } + + public int getPage() { + return page; + } + + public void setPage(int page) { + this.page = page; + } + + public int getPrevPage() { + return prevPage; + } + + public void setPrevPage(int prevPage) { + this.prevPage = prevPage; + } + + public int getMaxRowPerPage() { + return maxRowPerPage; + } + + public void setMaxRowPerPage(int maxRowPerPage) { + this.maxRowPerPage = maxRowPerPage; + } + + public String getOrderBy() { + return orderBy; + } + + public void setOrderBy(String orderBy) { + this.orderBy = orderBy; + } + + public int getResultRows() { + return resultRows; + } + + public void setResultRows(int resultRows) { + this.resultRows = resultRows; + } + + public void setHibernateSessionFactory(HibernateSessionFactory hsf) { + this.hsf = hsf; + + } + /** + * @return the limit + */ + public int getLimit() { + return limit; + } + /** + * @param limit the limit to set + */ + public void setLimit(int limit) { + this.limit = limit; + } + + + + + + +} Property changes on: trunk/src/java/org/blueoxygen/aconix/collection/action/EditCollection.java ___________________________________________________________________ Added: svn:mergeinfo + Modified: trunk/src/java/org/blueoxygen/aconix/collection/action/ListCollection.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/collection/action/ListCollection.java 2008-09-14 01:15:01 UTC (rev 80) +++ trunk/src/java/org/blueoxygen/aconix/collection/action/ListCollection.java 2008-09-25 02:09:22 UTC (rev 81) @@ -11,8 +11,6 @@ import org.blueoxygen.cimande.persistence.PersistenceAware; import org.blueoxygen.cimande.persistence.PersistenceManager; -import com.opensymphony.xwork2.ActionSupport; - /** * @author heaven * Modified: trunk/src/java/org/blueoxygen/aconix/collection/action/ListOrdered.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/collection/action/ListOrdered.java 2008-09-14 01:15:01 UTC (rev 80) +++ trunk/src/java/org/blueoxygen/aconix/collection/action/ListOrdered.java 2008-09-25 02:09:22 UTC (rev 81) @@ -7,9 +7,7 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashSet; import java.util.List; -import java.util.Set; import org.blueoxygen.cimande.CimandeAction; import org.blueoxygen.cimande.descriptors.Descriptor; @@ -17,10 +15,7 @@ import org.blueoxygen.cimande.persistence.PersistenceManager; import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactory; import org.hibernate.HibernateException; -import org.blueoxygen.aconix.entity.Article; -import com.opensymphony.xwork2.ActionSupport; - /** * @author heaven * Modified: trunk/src/java/org/blueoxygen/aconix/collection/action/OrderedCollection.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/collection/action/OrderedCollection.java 2008-09-14 01:15:01 UTC (rev 80) +++ trunk/src/java/org/blueoxygen/aconix/collection/action/OrderedCollection.java 2008-09-25 02:09:22 UTC (rev 81) @@ -3,16 +3,12 @@ */ package org.blueoxygen.aconix.collection.action; -import java.lang.reflect.InvocationTargetException; import java.sql.SQLException; import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.List; import org.apache.commons.beanutils.PropertyUtils; import org.blueoxygen.aconix.entity.ACollection; import org.blueoxygen.aconix.entity.CollectionDescriptor; -import org.blueoxygen.aconix.entity.CollectionSelectedDetail; import org.blueoxygen.cimande.LogInformation; import org.blueoxygen.cimande.descriptors.Descriptor; import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactory; Modified: trunk/src/java/org/blueoxygen/aconix/collection/action/SearchCollection.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/collection/action/SearchCollection.java 2008-09-14 01:15:01 UTC (rev 80) +++ trunk/src/java/org/blueoxygen/aconix/collection/action/SearchCollection.java 2008-09-25 02:09:22 UTC (rev 81) @@ -5,9 +5,7 @@ import java.sql.SQLException; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Set; import org.blueoxygen.aconix.entity.ACollection; import org.blueoxygen.aconix.entity.CollectionDescriptor; @@ -15,7 +13,6 @@ import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactory; import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactoryAware; import org.hibernate.Criteria; -import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.classic.Session; import org.hibernate.criterion.Expression; Modified: trunk/src/java/org/blueoxygen/aconix/collection/action/SelectedCollection.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/collection/action/SelectedCollection.java 2008-09-14 01:15:01 UTC (rev 80) +++ trunk/src/java/org/blueoxygen/aconix/collection/action/SelectedCollection.java 2008-09-25 02:09:22 UTC (rev 81) @@ -5,16 +5,16 @@ import java.sql.SQLException; import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.List; +import org.blueoxygen.aconix.entity.ACollection; +import org.blueoxygen.aconix.entity.Article; +import org.blueoxygen.aconix.entity.CollectionSelectedDetail; import org.blueoxygen.cimande.LogInformation; import org.blueoxygen.cimande.descriptors.Descriptor; import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactory; import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactoryAware; import org.blueoxygen.cimande.security.SessionCredentials; import org.blueoxygen.cimande.security.SessionCredentialsAware; -import org.blueoxygen.aconix.entity.*; import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.classic.Session; Copied: trunk/src/java/org/blueoxygen/aconix/collection/action/Up.java (from rev 80, trunk/src/java/org/blueoxygen/aconix/collection/action/up.java) =================================================================== --- trunk/src/java/org/blueoxygen/aconix/collection/action/Up.java (rev 0) +++ trunk/src/java/org/blueoxygen/aconix/collection/action/Up.java 2008-09-25 02:09:22 UTC (rev 81) @@ -0,0 +1,312 @@ +/** + * + */ +package org.blueoxygen.aconix.collection.action; + +import java.sql.SQLException; + +import org.blueoxygen.aconix.entity.ACollection; +import org.blueoxygen.aconix.entity.CollectionSelectedDetail; +import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactory; +import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactoryAware; +import org.hibernate.Criteria; +import org.hibernate.HibernateException; +import org.hibernate.classic.Session; +import org.hibernate.criterion.Expression; +import org.hibernate.criterion.MatchMode; +import org.hibernate.criterion.Order; + +/** + * @author heaven + * + */ +public class Up extends CollectionForm implements HibernateSessionFactoryAware { + private HibernateSessionFactory hsf; + private Session sess; + private String moduleDescriptorId = ""; + private String moduleDescriptorDescription = ""; + private String id = ""; + private int olderRank; + private int NewerRank; + private int tempRank; + private String tempId = ""; + private String vm=""; + private String articleId = ""; + private String articleDescription = ""; + + private int maxPage; + private int currPage; + private int nextPage; + private int page; + private int prevPage = 0; + private int maxRowPerPage = 10; + private String orderBy = "rank"; + private int resultRows; + + public String execute() { + setCollection((ACollection) getManager().getById(ACollection.class, getCollection().getId())); + if (getId() != null) { + //setCollection((ACollection) getManager().getById(ACollection.class, getCollection().getId())); + setSelectedDetail((CollectionSelectedDetail) getManager().getById( + CollectionSelectedDetail.class, getId())); + + tempId = getSelectedDetail().getCollection().getId(); + tempRank = getSelectedDetail().getRank(); + + moduleDescriptorId = getSelectedDetail().getDescriptor().getId(); + moduleDescriptorDescription = getSelectedDetail().getDescriptor().getName(); + + if(tempRank == 1){ + + }else{ + NewerRank = tempRank-1; + getSelectedDetail().setRank(NewerRank); + } + } + setSelectedDetails(getManager().getList("FROM "+CollectionSelectedDetail.class.getName()+" e WHERE e.collection.id='"+tempId+"' AND e.rank='"+NewerRank+"'", null, null)); + for(CollectionSelectedDetail csd : getSelectedDetails()){ + csd.setRank(tempRank); + getManager().save(csd); + } + + sess = hsf.createSession(); + Criteria crit = sess.createCriteria(CollectionSelectedDetail.class); + + if(!"".equals(getCollection().getId())){ + crit.add(Expression.like("collection.id", getCollection().getId() , MatchMode.ANYWHERE)); + } + + resultRows = crit.list().size(); + maxPage = resultRows / maxRowPerPage; + if (resultRows % maxRowPerPage == 0) maxPage = maxPage - 1; + + setSelectedDetails(crit.addOrder(Order.asc(orderBy)) + .setFirstResult(currPage * maxRowPerPage) + .setMaxResults(maxRowPerPage) + .list()); + + prevPage = currPage - 1; + nextPage = currPage + 1; + page = currPage + 1 ; + + + try { + hsf.endSession(sess); + } catch (HibernateException e) { + e.printStackTrace(); + } catch (SQLException e) { + e.printStackTrace(); + } + vm = getVm(); + setId(""); + return SUCCESS; + } + + /** + * @return the id + */ + public String getId() { + return id; + } + + /** + * @param id + * the id to set + */ + public void setId(String id) { + this.id = id; + } + + + + /** + * @return the maxPage + */ + public int getMaxPage() { + return maxPage; + } + + /** + * @param maxPage the maxPage to set + */ + public void setMaxPage(int maxPage) { + this.maxPage = maxPage; + } + + /** + * @return the currPage + */ + public int getCurrPage() { + return currPage; + } + + /** + * @param currPage the currPage to set + */ + public void setCurrPage(int currPage) { + this.currPage = currPage; + } + + /** + * @return the nextPage + */ + public int getNextPage() { + return nextPage; + } + + /** + * @param nextPage the nextPage to set + */ + public void setNextPage(int nextPage) { + this.nextPage = nextPage; + } + + /** + * @return the page + */ + public int getPage() { + return page; + } + + /** + * @param page the page to set + */ + public void setPage(int page) { + this.page = page; + } + + /** + * @return the prevPage + */ + public int getPrevPage() { + return prevPage; + } + + /** + * @param prevPage the prevPage to set + */ + public void setPrevPage(int prevPage) { + this.prevPage = prevPage; + } + + /** + * @return the maxRowPerPage + */ + public int getMaxRowPerPage() { + return maxRowPerPage; + } + + /** + * @param maxRowPerPage the maxRowPerPage to set + */ + public void setMaxRowPerPage(int maxRowPerPage) { + this.maxRowPerPage = maxRowPerPage; + } + + /** + * @return the orderBy + */ + public String getOrderBy() { + return orderBy; + } + + /** + * @param orderBy the orderBy to set + */ + public void setOrderBy(String orderBy) { + this.orderBy = orderBy; + } + + /** + * @return the resultRows + */ + public int getResultRows() { + return resultRows; + } + + /** + * @param resultRows the resultRows to set + */ + public void setResultRows(int resultRows) { + this.resultRows = resultRows; + } + + public void setHibernateSessionFactory(HibernateSessionFactory hsf) { + this.hsf = hsf; + } + + /** + * @return the moduleDescriptorId + */ + public String getModuleDescriptorId() { + return moduleDescriptorId; + } + + /** + * @param moduleDescriptorId the moduleDescriptorId to set + */ + public void setModuleDescriptorId(String moduleDescriptorId) { + this.moduleDescriptorId = moduleDescriptorId; + } + + /** + * @return the moduleDescriptorDescription + */ + public String getModuleDescriptorDescription() { + return moduleDescriptorDescription; + } + + /** + * @param moduleDescriptorDescription the moduleDescriptorDescription to set + */ + public void setModuleDescriptorDescription(String moduleDescriptorDescription) { + this.moduleDescriptorDescription = moduleDescriptorDescription; + } + + /** + * @return the vm + */ + public String getVm() { + return vm; + } + + /** + * @param vm the vm to set + */ + public void setVm(String vm) { + this.vm = vm; + } + + /** + * @return the articleId + */ + public String getArticleId() { + return articleId; + } + + /** + * @param articleId the articleId to set + */ + public void setArticleId(String articleId) { + this.articleId = articleId; + } + + /** + * @return the articleDescription + */ + public String getArticleDescription() { + return articleDescription; + } + + /** + * @param articleDescription the articleDescription to set + */ + public void setArticleDescription(String articleDescription) { + this.articleDescription = articleDescription; + } + + + + + +} Property changes on: trunk/src/java/org/blueoxygen/aconix/collection/action/Up.java ___________________________________________________________________ Added: svn:mergeinfo + Deleted: trunk/src/java/org/blueoxygen/aconix/collection/action/down.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/collection/action/down.java 2008-09-14 01:15:01 UTC (rev 80) +++ trunk/src/java/org/blueoxygen/aconix/collection/action/down.java 2008-09-25 02:09:22 UTC (rev 81) @@ -1,292 +0,0 @@ -/** - * - */ -package org.blueoxygen.aconix.collection.action; - -import java.sql.SQLException; - -import org.blueoxygen.aconix.entity.ACollection; -import org.blueoxygen.aconix.entity.CollectionSelectedDetail; -import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactory; -import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactoryAware; -import org.hibernate.Criteria; -import org.hibernate.HibernateException; -import org.hibernate.classic.Session; -import org.hibernate.criterion.Expression; -import org.hibernate.criterion.MatchMode; -import org.hibernate.criterion.Order; - -/** - * @author heaven - * - */ -public class down extends CollectionForm implements HibernateSessionFactoryAware { - private HibernateSessionFactory hsf; - private Session sess; - private String moduleDescriptorId = ""; - private String moduleDescriptorDescription = ""; - private String id = ""; - private int olderRank; - private int NewerRank; - private int tempRank; - private String tempId = ""; - private String vm=""; - private String articleId = ""; - private String articleDescription = ""; - - private int maxPage; - private int currPage; - private int nextPage; - private int page; - private int prevPage = 0; - private int maxRowPerPage = 10; - private String orderBy = "rank"; - private int resultRows; - - public String execute(){ - setCollection((ACollection) getManager().getById(ACollection.class, getCollection().getId())); - if (getId() != null) { - setSelectedDetail((CollectionSelectedDetail) getManager().getById( - CollectionSelectedDetail.class, getId())); - - tempId = getSelectedDetail().getCollection().getId(); - tempRank = getSelectedDetail().getRank(); - - moduleDescriptorId = getSelectedDetail().getDescriptor().getId(); - moduleDescriptorDescription = getSelectedDetail().getDescriptor().getName(); - - NewerRank = tempRank+1; - getSelectedDetail().setRank(NewerRank); - - } - setSelectedDetails(getManager().getList("FROM "+CollectionSelectedDetail.class.getName()+" e WHERE e.collection.id='"+tempId+"' AND e.rank='"+NewerRank+"'", null, null)); - for(CollectionSelectedDetail csd : getSelectedDetails()){ - csd.setRank(tempRank); - getManager().save(csd); - } - - - sess = hsf.createSession(); - Criteria crit = sess.createCriteria(CollectionSelectedDetail.class); - - if(!"".equals(getCollection().getId())){ - crit.add(Expression.like("collection.id", getCollection().getId() , MatchMode.ANYWHERE)); - } - - resultRows = crit.list().size(); - maxPage = resultRows / maxRowPerPage; - if (resultRows % maxRowPerPage == 0) maxPage = maxPage - 1; - - setSelectedDetails(crit.addOrder(Order.asc(orderBy)) - .setFirstResult(currPage * maxRowPerPage) - .setMaxResults(maxRowPerPage) - .list()); - - prevPage = currPage - 1; - nextPage = currPage + 1; - page = currPage + 1 ; - - - try { - hsf.endSession(sess); - } catch (HibernateException e) { - e.printStackTrace(); - } catch (SQLException e) { - e.printStackTrace(); - } - vm = getVm(); - setId(""); - return SUCCESS; - } - - /** - * @return the articleDescription - */ - public String getArticleDescription() { - return articleDescription; - } - - /** - * @param articleDescription the articleDescription to set - */ - public void setArticleDescription(String articleDescription) { - this.articleDescription = articleDescription; - } - - /** - * @return the id - */ - public String getId() { - return id; - } - - /** - * @param id the id to set - */ - public void setId(String id) { - this.id = id; - } - - - /** - * @return the maxPage - */ - public int getMaxPage() { - return maxPage; - } - - /** - * @param maxPage the maxPage to set - */ - public void setMaxPage(int maxPage) { - this.maxPage = maxPage; - } - - /** - * @return the currPage - */ - public int getCurrPage() { - return currPage; - } - - /** - * @param currPage the currPage to set - */ - public void setCurrPage(int currPage) { - this.currPage = currPage; - } - - /** - * @return the nextPage - */ - public int getNextPage() { - return nextPage; - } - - /** - * @param nextPage the nextPage to set - */ - public void setNextPage(int nextPage) { - this.nextPage = nextPage; - } - - /** - * @return the page - */ - public int getPage() { - return page; - } - - /** - * @param page the page to set - */ - public void setPage(int page) { - this.page = page; - } - - /** - * @return the prevPage - */ - public int getPrevPage() { - return prevPage; - } - - /** - * @param prevPage the prevPage to set - */ - public void setPrevPage(int prevPage) { - this.prevPage = prevPage; - } - - /** - * @return the maxRowPerPage - */ - public int getMaxRowPerPage() { - return maxRowPerPage; - } - - /** - * @param maxRowPerPage the maxRowPerPage to set - */ - public void setMaxRowPerPage(int maxRowPerPage) { - this.maxRowPerPage = maxRowPerPage; - } - - /** - * @return the orderBy - */ - public String getOrderBy() { - return orderBy; - } - - /** - * @param orderBy the orderBy to set - */ - public void setOrderBy(String orderBy) { - this.orderBy = orderBy; - } - - /** - * @return the resultRows - */ - public int getResultRows() { - return resultRows; - } - - /** - * @param resultRows the resultRows to set - */ - public void setResultRows(int resultRows) { - this.resultRows = resultRows; - } - public void setHibernateSessionFactory(HibernateSessionFactory hsf) { - this.hsf = hsf; - } - - /** - * @return the moduleDescriptorId - */ - public String getModuleDescriptorId() { - return moduleDescriptorId; - } - - /** - * @param moduleDescriptorId the moduleDescriptorId to set - */ - public void setModuleDescriptorId(String moduleDescriptorId) { - this.moduleDescriptorId = moduleDescriptorId; - } - - /** - * @return the moduleDescriptorDescription - */ - public String getModuleDescriptorDescription() { - return moduleDescriptorDescription; - } - - /** - * @param moduleDescriptorDescription the moduleDescriptorDescription to set - */ - public void setModuleDescriptorDescription(String moduleDescriptorDescription) { - this.moduleDescriptorDescription = moduleDescriptorDescription; - } - - /** - * @return the vm - */ - public String getVm() { - return vm; - } - - /** - * @param vm the vm to set - */ - public void setVm(String vm) { - this.vm = vm; - } - - - - - -} Deleted: trunk/src/java/org/blueoxygen/aconix/collection/action/editCollection.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/collection/action/editCollection.java 2008-09-14 01:15:01 UTC (rev 80) +++ trunk/src/java/org/blueoxygen/aconix/collection/action/editCollection.java 2008-09-25 02:09:22 UTC (rev 81) @@ -1,323 +0,0 @@ -/** - * - */ -package org.blueoxygen.aconix.collection.action; - -import java.sql.SQLException; -import java.sql.Timestamp; - -import org.blueoxygen.aconix.entity.ACollection; -import org.blueoxygen.aconix.entity.CollectionDescriptor; -import org.blueoxygen.aconix.entity.CollectionSelectedDetail; -import org.blueoxygen.cimande.LogInformation; -import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactory; -import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactoryAware; -import org.hibernate.Criteria; -import org.hibernate.HibernateException; -import org.hibernate.classic.Session; -import org.hibernate.criterion.Expression; -import org.hibernate.criterion.MatchMode; -import org.hibernate.criterion.Order; - -/** - * @author SiLeNT~SkY - * - */ -public class editCollection extends CollectionForm implements HibernateSessionFactoryAware { - private String id = ""; - private String moduleDescriptorId = ""; - private String moduleDescriptorDescription = ""; - private String articleId = ""; - private String articleDescription = ""; - private String collection_id = ""; - private String collectionId = ""; - private int limit; - - private HibernateSessionFactory hsf; - private Session sess; - private int maxPage; - private int currPage; - private int nextPage; - private int page; - private int prevPage = 0; - private int maxRowPerPage = 10; - private String orderBy = "collection.id"; - private int resultRows; - - public String execute(){ - if(!"".equalsIgnoreCase(getCollection_id())){ - setCollection((ACollection) getManager().getById(ACollection.class, getCollection_id())); - } - if(!"".equalsIgnoreCase(getId())){ - setSelectedDetail((CollectionSelectedDetail) getManager().getById(CollectionSelectedDetail.class, getId())); - - setModuleDescriptorId(getSelectedDetail().getDescriptor().getId()); - } - - - sess = hsf.createSession(); - Criteria crit = sess.createCriteria(CollectionSelectedDetail.class); - - if(!"".equals(getCollection().getId())){ - crit.add(Expression.like("collection.id", getCollection().getId() , MatchMode.ANYWHERE)); - } - - resultRows = crit.list().size(); - maxPage = resultRows / maxRowPerPage; - if (resultRows % maxRowPerPage == 0) maxPage = maxPage - 1; - - setSelectedDetails(crit.addOrder(Order.asc(orderBy)) - .setFirstResult(currPage * maxRowPerPage) - .setMaxResults(maxRowPerPage) - .list()); - - prevPage = currPage - 1; - nextPage = currPage + 1; - page = currPage + 1 ; - - - try { - hsf.endSession(sess); - } catch (HibernateException e) { - e.printStackTrace(); - } catch (SQLException e) { - e.printStackTrace(); - } - - setCollection_id(getCollection().getId()); - setId(getId()); - return SUCCESS; - } - public String editOrdered(){ - if(!"".equalsIgnoreCase(getCollection().getId())){ - setCollection((ACollection) getManager().getById(ACollection.class, getCollection().getId())); - } - if(!"".equalsIgnoreCase(getId())){ - setCollectionDescriptor((CollectionDescriptor) getManager().getById(CollectionDescriptor.class, getId())); - setLimit(getCollectionDescriptor().getLimitValue()); - setModuleDescriptorId(getCollectionDescriptor().getDescriptor().getId()); - setModuleDescriptorDescription(getCollectionDescriptor().getDescriptor().getDescription()); - - - } - - sess = hsf.createSession(); - Criteria crit = sess.createCriteria(CollectionDescriptor.class); - - if(!"".equals(getCollection_id())){ - crit.add(Expression.like("collection.id", getCollection_id() , MatchMode.ANYWHERE)); - } - - resultRows = crit.list().size(); - maxPage = resultRows / maxRowPerPage; - if (resultRows % maxRowPerPage == 0) maxPage = maxPage - 1; - - setCollectionDescriptors(crit.addOrder(Order.asc(orderBy)) - .setFirstResult(currPage * maxRowPerPage) - .setMaxResults(maxRowPerPage) - .list()); - - prevPage = currPage - 1; - nextPage = currPage + 1; - page = currPage + 1 ; - - - try { - hsf.endSession(sess); - } catch (HibernateException e) { - e.printStackTrace(); - } catch (SQLException e) { - e.printStackTrace(); - } - - setCollection_id(getCollection().getId()); - setId(getId()); - return SUCCESS; - } - - /** - * @return the id - */ - public String getId() { - return id; - } - - /** - * @param id the id to set - */ - public void setId(String id) { - this.id = id; - } - - /** - * @return the moduleDescriptorId - */ - public String getModuleDescriptorId() { - return moduleDescriptorId; - } - - /** - * @param moduleDescriptorId the moduleDescriptorId to set - */ - public void setModuleDescriptorId(String moduleDescriptorId) { - this.moduleDescriptorId = moduleDescriptorId; - } - - /** - * @return the moduleDescriptorDescription - */ - public String getModuleDescriptorDescription() { - return moduleDescriptorDescription; - } - - /** - * @param moduleDescriptorDescription the moduleDescriptorDescription to set - */ - public void setModuleDescriptorDescription(String moduleDescriptorDescription) { - this.moduleDescriptorDescription = moduleDescriptorDescription; - } - - /** - * @return the articleId - */ - public String getArticleId() { - return articleId; - } - - /** - * @param articleId the articleId to set - */ - public void setArticleId(String articleId) { - this.articleId = articleId; - } - - /** - * @return the articleDescription - */ - public String getArticleDescription() { - return articleDescription; - } - - /** - * @param articleDescription the articleDescription to set - */ - public void setArticleDescription(String articleDescription) { - this.articleDescription = articleDescription; - } - - /** - * @return the collection_id - */ - public String getCollection_id() { - return collection_id; - } - - /** - * @param collection_id the collection_id to set - */ - public void setCollection_id(String collection_id) { - this.collection_id = collection_id; - } - - /** - * @return the collectionId - */ - public String getCollectionId() { - return collectionId; - } - - /** - * @param collectionId the collectionId to set - */ - public void setCollectionId(String collectionId) { - this.collectionId = collectionId; - } - - - public int getMaxPage() { - return maxPage; - } - - public void setMaxPage(int maxPage) { - this.maxPage = maxPage; - } - - public int getCurrPage() { - return currPage; - } - - public void setCurrPage(int currPage) { - this.currPage = currPage; - } - - public int getNextPage() { - return nextPage; - } - - public void setNextPage(int nextPage) { - this.nextPage = nextPage; - } - - public int getPage() { - return page; - } - - public void setPage(int page) { - this.page = page; - } - - public int getPrevPage() { - return prevPage; - } - - public void setPrevPage(int prevPage) { - this.prevPage = prevPage; - } - - public int getMaxRowPerPage() { - return maxRowPerPage; - } - - public void setMaxRowPerPage(int maxRowPerPage) { - this.maxRowPerPage = maxRowPerPage; - } - - public String getOrderBy() { - return orderBy; - } - - public void setOrderBy(String orderBy) { - this.orderBy = orderBy; - } - - public int getResultRows() { - return resultRows; - } - - public void setResultRows(int resultRows) { - this.resultRows = resultRows; - } - - public void setHibernateSessionFactory(HibernateSessionFactory hsf) { - this.hsf = hsf; - - } - /** - * @return the limit - */ - public int getLimit() { - return limit; - } - /** - * @param limit the limit to set - */ - public void setLimit(int limit) { - this.limit = limit; - } - - - - - - -} Deleted: trunk/src/java/org/blueoxygen/aconix/collection/action/up.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/collection/action/up.java 2008-09-14 01:15:01 UTC (rev 80) +++ trunk/src/java/org/blueoxygen/aconix/collection/action/up.java 2008-09-25 02:09:22 UTC (rev 81) @@ -1,313 +0,0 @@ -/** - * - */ -package org.blueoxygen.aconix.collection.action; - -import java.sql.SQLException; -import java.util.ArrayList; - -import org.blueoxygen.aconix.entity.ACollection; -import org.blueoxygen.aconix.entity.CollectionSelectedDetail; -import org.blueoxygen.cima... [truncated message content] |
From: <kas...@us...> - 2008-09-14 01:14:52
|
Revision: 80 http://aconix.svn.sourceforge.net/aconix/?rev=80&view=rev Author: kaskuers Date: 2008-09-14 01:15:01 +0000 (Sun, 14 Sep 2008) Log Message: ----------- update : new Logo blueoxygen Modified Paths: -------------- trunk/src/java/org/blueoxygen/aconix/article/action/AddArticle.java trunk/src/template/view/frontpage/index.vm trunk/src/template/view/module/aconix/article/ArticleForm.vm Modified: trunk/src/java/org/blueoxygen/aconix/article/action/AddArticle.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/article/action/AddArticle.java 2008-09-10 08:03:32 UTC (rev 79) +++ trunk/src/java/org/blueoxygen/aconix/article/action/AddArticle.java 2008-09-14 01:15:01 UTC (rev 80) @@ -29,6 +29,8 @@ addActionError("Abstract is required"); }if("".equals(getArticle().getDescription())){ addActionError("Description is required"); + }if("".equals(getStatus())){ + addActionError("Status is required"); } if(hasActionErrors()){ return INPUT; Modified: trunk/src/template/view/frontpage/index.vm =================================================================== --- trunk/src/template/view/frontpage/index.vm 2008-09-10 08:03:32 UTC (rev 79) +++ trunk/src/template/view/frontpage/index.vm 2008-09-14 01:15:01 UTC (rev 80) @@ -38,7 +38,7 @@ </head> <body> -<table width="100%" border="1" cellspacing="0" cellpadding="0"> +<table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td width="200" valign="top"><div class="image"><img src="../images/e-business-suite.gif" /></div></td> <td colspan="4"> </td> @@ -110,7 +110,6 @@ #set($r = $r + 1) #end #end - <tr><td><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br></td></tr> </table> </td> Modified: trunk/src/template/view/module/aconix/article/ArticleForm.vm =================================================================== --- trunk/src/template/view/module/aconix/article/ArticleForm.vm 2008-09-10 08:03:32 UTC (rev 79) +++ trunk/src/template/view/module/aconix/article/ArticleForm.vm 2008-09-14 01:15:01 UTC (rev 80) @@ -55,14 +55,16 @@ </td> </tr> <tr bgcolor="#ffffff"> - <td align="right">Status :</td> + <td align="right"><span + style="color: red;">*</span>Status :</td> <td><select name="status"> <option value="0">Incomplete</option> <option value="1">Complete</option> </select></td> </tr> <tr bgcolor="#ffffff"> - <td align="right">Category :</td> + <td align="right"><span + style="color: red;">*</span>Category :</td> <td><select name="categoryId"> <option value=""> </option> #foreach($cat in $ACategorys) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kas...@us...> - 2008-09-10 08:03:21
|
Revision: 79 http://aconix.svn.sourceforge.net/aconix/?rev=79&view=rev Author: kaskuers Date: 2008-09-10 08:03:32 +0000 (Wed, 10 Sep 2008) Log Message: ----------- fixed GAP between menu and category Modified Paths: -------------- trunk/src/template/view/frontpage/about.vm trunk/src/template/view/frontpage/detail.vm trunk/src/template/view/frontpage/detailCat.vm trunk/src/template/view/frontpage/index.vm Modified: trunk/src/template/view/frontpage/about.vm =================================================================== --- trunk/src/template/view/frontpage/about.vm 2008-09-10 01:57:20 UTC (rev 78) +++ trunk/src/template/view/frontpage/about.vm 2008-09-10 08:03:32 UTC (rev 79) @@ -129,10 +129,7 @@ </table></td> </tr> <tr> - <td> </td> - </tr> - <tr> - <td width="200" height="300" valign="top"><div class="selected"> + <td width="200" height="300" valign="top"><br><div class="selected"> <table width="200" height="300" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="20" height="42"><img src="../images/aconix/kiri-atas.gif" width="20" height="42" /></td> @@ -173,6 +170,9 @@ </div></td> </tr> <tr> + <td> </td> + </tr> + <tr> <td colspan="5" align="center">copyright © Blueoxygen Technology, 2001-2008</td> </tr> </table> Modified: trunk/src/template/view/frontpage/detail.vm =================================================================== --- trunk/src/template/view/frontpage/detail.vm 2008-09-10 01:57:20 UTC (rev 78) +++ trunk/src/template/view/frontpage/detail.vm 2008-09-10 08:03:32 UTC (rev 79) @@ -140,10 +140,7 @@ </table></td> </tr> <tr> - <td> </td> - </tr> - <tr> - <td width="200" height="300" valign="top"><div class="selected"> + <td width="200" height="300" valign="top"><br><div class="selected"> <table width="200" height="300" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="20" height="42"><img src="../images/aconix/kiri-atas.gif" width="20" height="42" /></td> @@ -184,6 +181,9 @@ </div></td> </tr> <tr> + <td> </td> + </tr> + <tr> <td colspan="5" align="center">copyright © Blueoxygen Technology, 2001-2008</td> </tr> </table> Modified: trunk/src/template/view/frontpage/detailCat.vm =================================================================== --- trunk/src/template/view/frontpage/detailCat.vm 2008-09-10 01:57:20 UTC (rev 78) +++ trunk/src/template/view/frontpage/detailCat.vm 2008-09-10 08:03:32 UTC (rev 79) @@ -141,10 +141,7 @@ </table></td> </tr> <tr> - <td> </td> - </tr> - <tr> - <td width="200" height="300" valign="top"><div class="selected"> + <td width="200" height="300" valign="top"><br><div class="selected"> <table width="200" height="300" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="20" height="42"><img src="../images/aconix/kiri-atas.gif" width="20" height="42" /></td> @@ -185,6 +182,9 @@ </div></td> </tr> <tr> + <td> </td> + </tr> + <tr> <td colspan="5" align="center">copyright © Blueoxygen Technology, 2001-2008</td> </tr> </table> Modified: trunk/src/template/view/frontpage/index.vm =================================================================== --- trunk/src/template/view/frontpage/index.vm 2008-09-10 01:57:20 UTC (rev 78) +++ trunk/src/template/view/frontpage/index.vm 2008-09-10 08:03:32 UTC (rev 79) @@ -38,7 +38,7 @@ </head> <body> -<table width="100%" border="0" cellspacing="0" cellpadding="0"> +<table width="100%" border="1" cellspacing="0" cellpadding="0"> <tr> <td width="200" valign="top"><div class="image"><img src="../images/e-business-suite.gif" /></div></td> <td colspan="4"> </td> @@ -110,6 +110,7 @@ #set($r = $r + 1) #end #end + <tr><td><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br></td></tr> </table> </td> @@ -152,10 +153,7 @@ </table></td> </tr> <tr> - <td> </td> - </tr> - <tr> - <td width="200" height="300" valign="top"><div class="selected"> + <td width="200" height="300" valign="top"><br><div class="selected"> <table width="200" height="300" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="20" height="42"><img src="../images/aconix/kiri-atas.gif" width="20" height="42" /></td> @@ -196,6 +194,9 @@ </div></td> </tr> <tr> + <td> </td> + </tr> + <tr> <td colspan="5" align="center">copyright © Blueoxygen Technology, 2001-2008</td> </tr> </table> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kas...@us...> - 2008-09-10 01:57:10
|
Revision: 78 http://aconix.svn.sourceforge.net/aconix/?rev=78&view=rev Author: kaskuers Date: 2008-09-10 01:57:20 +0000 (Wed, 10 Sep 2008) Log Message: ----------- copyright fixed Modified Paths: -------------- trunk/src/java/org/blueoxygen/aconix/collection/action/CollectionForm.java trunk/src/java/org/blueoxygen/aconix/collection/action/SearchCollection.java trunk/src/template/view/frontpage/about.vm trunk/src/template/view/frontpage/detail.vm trunk/src/template/view/frontpage/detailCat.vm trunk/src/template/view/frontpage/index.vm trunk/src/template/view/module/aconix/collection/result.vm Modified: trunk/src/java/org/blueoxygen/aconix/collection/action/CollectionForm.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/collection/action/CollectionForm.java 2008-09-08 03:39:59 UTC (rev 77) +++ trunk/src/java/org/blueoxygen/aconix/collection/action/CollectionForm.java 2008-09-10 01:57:20 UTC (rev 78) @@ -35,7 +35,7 @@ protected ACollection collection = new ACollection(); protected CollectionSelectedDetail SelectedDetail = new CollectionSelectedDetail(); protected CollectionDescriptor collectionDescriptor = new CollectionDescriptor(); - private List<CollectionSelectedDetail> selectedDetails = new ArrayList<CollectionSelectedDetail>(); + protected List<CollectionSelectedDetail> selectedDetails = new ArrayList<CollectionSelectedDetail>(); private List<ACollection> collections = new ArrayList<ACollection>(); private List<CollectionDescriptor> collectionDescriptors = new ArrayList<CollectionDescriptor>(); private String msg=""; Modified: trunk/src/java/org/blueoxygen/aconix/collection/action/SearchCollection.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/collection/action/SearchCollection.java 2008-09-08 03:39:59 UTC (rev 77) +++ trunk/src/java/org/blueoxygen/aconix/collection/action/SearchCollection.java 2008-09-10 01:57:20 UTC (rev 78) @@ -4,7 +4,9 @@ package org.blueoxygen.aconix.collection.action; import java.sql.SQLException; +import java.util.ArrayList; import java.util.HashSet; +import java.util.List; import java.util.Set; import org.blueoxygen.aconix.entity.ACollection; @@ -28,6 +30,7 @@ private HibernateSessionFactory hsf; private Session sess; private String type=""; + private List name = new ArrayList(); private int maxPage; private int currPage; @@ -108,6 +111,13 @@ } catch (SQLException e) { e.printStackTrace(); } + /*if(getCollection().getName().equalsIgnoreCase("") && getCollection().getDescription().equalsIgnoreCase("")){ + selectedDetails = getManager().getList("SELECT DISTINCT t.collection.id FROM "+CollectionSelectedDetail.class.getName()+" t ",null,null); + for(int i = 0 ; i < selectedDetails.size() ; i++){ + setCollection((ACollection) getManager().getById(ACollection.class, selectedDetails.get(i))); + } + resultRows = selectedDetails.size(); + }*/ } return SUCCESS; } @@ -149,8 +159,22 @@ this.hsf = hsf; } + + /** + * @return the name + */ + public List getName() { + return name; + } /** + * @param name the name to set + */ + public void setName(List name) { + this.name = name; + } + + /** * @return the maxPage */ public int getMaxPage() { Modified: trunk/src/template/view/frontpage/about.vm =================================================================== --- trunk/src/template/view/frontpage/about.vm 2008-09-08 03:39:59 UTC (rev 77) +++ trunk/src/template/view/frontpage/about.vm 2008-09-10 01:57:20 UTC (rev 78) @@ -12,7 +12,7 @@ .ordered{ position:relative; width:auto; - height:400px; + height:auto; } .menu{ @@ -31,8 +31,8 @@ height:400px; } body{ - font:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; + font: 8pt Arial; + } </style> Modified: trunk/src/template/view/frontpage/detail.vm =================================================================== --- trunk/src/template/view/frontpage/detail.vm 2008-09-08 03:39:59 UTC (rev 77) +++ trunk/src/template/view/frontpage/detail.vm 2008-09-10 01:57:20 UTC (rev 78) @@ -12,7 +12,7 @@ .ordered{ position:relative; width:auto; - height:400px; + height:auto; } .menu{ @@ -31,8 +31,7 @@ height:400px; } body{ - font:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; + font: 8pt Arial; } </style> Modified: trunk/src/template/view/frontpage/detailCat.vm =================================================================== --- trunk/src/template/view/frontpage/detailCat.vm 2008-09-08 03:39:59 UTC (rev 77) +++ trunk/src/template/view/frontpage/detailCat.vm 2008-09-10 01:57:20 UTC (rev 78) @@ -12,7 +12,7 @@ .ordered{ position:relative; width:auto; - height:400px; + height:auto; } .menu{ @@ -31,8 +31,7 @@ height:400px; } body{ - font:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; + font: 8pt Arial; } </style> Modified: trunk/src/template/view/frontpage/index.vm =================================================================== --- trunk/src/template/view/frontpage/index.vm 2008-09-08 03:39:59 UTC (rev 77) +++ trunk/src/template/view/frontpage/index.vm 2008-09-10 01:57:20 UTC (rev 78) @@ -12,7 +12,7 @@ .ordered{ position:relative; width:auto; - height:400px; + height:auto; } .menu{ @@ -31,8 +31,7 @@ height:400px; } body{ - font:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; + font: 8pt Arial; } </style> Modified: trunk/src/template/view/module/aconix/collection/result.vm =================================================================== --- trunk/src/template/view/module/aconix/collection/result.vm 2008-09-08 03:39:59 UTC (rev 77) +++ trunk/src/template/view/module/aconix/collection/result.vm 2008-09-10 01:57:20 UTC (rev 78) @@ -39,8 +39,8 @@ </tr> #foreach($SelDel in $selectedDetails) <tr bgcolor="#ffffff"> - <td>$SelDel.collection.name</td> - <td><a href="../collection/edit.action?collection.id=$SelDel.collection.id" title="Edit"><img src="../../images/silk/page_edit.png" border="0"></a> <a href="../collection/delete.action?collection.id=$SelDel.collection.id" title="Delete"><img src="../../images/silk/delete.png" border="0"></a></td> + <td>$!SelDel.collection.name</td> + <td><a href="../collection/edit.action?collection.id=$SelDel" title="Edit"><img src="../../images/silk/page_edit.png" border="0"></a> <a href="../collection/delete.action?collection.id=$SelDel" title="Delete"><img src="../../images/silk/delete.png" border="0"></a></td> </tr> #end #end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kas...@us...> - 2008-09-08 03:39:49
|
Revision: 77 http://aconix.svn.sourceforge.net/aconix/?rev=77&view=rev Author: kaskuers Date: 2008-09-08 03:39:59 +0000 (Mon, 08 Sep 2008) Log Message: ----------- edited font and some actions Modified Paths: -------------- trunk/src/config/struts-aconix.xml trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java trunk/src/template/view/frontpage/about.vm trunk/src/template/view/frontpage/detail.vm trunk/src/template/view/frontpage/detailCat.vm trunk/src/template/view/frontpage/index.vm Modified: trunk/src/config/struts-aconix.xml =================================================================== --- trunk/src/config/struts-aconix.xml 2008-09-08 02:30:53 UTC (rev 76) +++ trunk/src/config/struts-aconix.xml 2008-09-08 03:39:59 UTC (rev 77) @@ -185,7 +185,7 @@ <action name="view" class="org.blueoxygen.aconix.frontpage.action.ViewDetail" method="viewByCat"> <result name="success" type="velocity">/view/frontpage/detailCat.vm</result> </action> - <action name="about" class="org.blueoxygen.aconix.frontpage.action.ViewDetail"> + <action name="about" class="org.blueoxygen.aconix.pageCollection.action.Preview"> <result name="success" type="velocity">/view/frontpage/about.vm</result> </action> </package> Modified: trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java 2008-09-08 02:30:53 UTC (rev 76) +++ trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java 2008-09-08 03:39:59 UTC (rev 77) @@ -64,7 +64,7 @@ "SELECT * FROM " + m.getDescriptor() .getName() - + " WHERE active_flag='1' ORDER BY " + + " WHERE active_flag=1 ORDER BY " + m.getOrderedBy() + " DESC LIMIT " + m.getLimitValue()); Modified: trunk/src/template/view/frontpage/about.vm =================================================================== --- trunk/src/template/view/frontpage/about.vm 2008-09-08 02:30:53 UTC (rev 76) +++ trunk/src/template/view/frontpage/about.vm 2008-09-08 03:39:59 UTC (rev 77) @@ -30,6 +30,11 @@ width:200px; height:400px; } +body{ + font:Verdana, Arial, Helvetica, sans-serif; + font-size:12px; + } + </style> </head> @@ -83,7 +88,7 @@ </tr> <tr> <td background="../images/aconix/ordered-kiri.gif"></td> -<td valign="top"> +<td align="center"><font size="3"><strong>shentake is a learning center for Java and OpenSource</strong></font> </td> <td background="../images/aconix/ordered-kanan.gif"></td> </tr> Modified: trunk/src/template/view/frontpage/detail.vm =================================================================== --- trunk/src/template/view/frontpage/detail.vm 2008-09-08 02:30:53 UTC (rev 76) +++ trunk/src/template/view/frontpage/detail.vm 2008-09-08 03:39:59 UTC (rev 77) @@ -30,6 +30,11 @@ width:200px; height:400px; } +body{ + font:Verdana, Arial, Helvetica, sans-serif; + font-size:12px; + } + </style> </head> Modified: trunk/src/template/view/frontpage/detailCat.vm =================================================================== --- trunk/src/template/view/frontpage/detailCat.vm 2008-09-08 02:30:53 UTC (rev 76) +++ trunk/src/template/view/frontpage/detailCat.vm 2008-09-08 03:39:59 UTC (rev 77) @@ -30,6 +30,11 @@ width:200px; height:400px; } +body{ + font:Verdana, Arial, Helvetica, sans-serif; + font-size:12px; + } + </style> </head> Modified: trunk/src/template/view/frontpage/index.vm =================================================================== --- trunk/src/template/view/frontpage/index.vm 2008-09-08 02:30:53 UTC (rev 76) +++ trunk/src/template/view/frontpage/index.vm 2008-09-08 03:39:59 UTC (rev 77) @@ -30,6 +30,11 @@ width:200px; height:400px; } +body{ + font:Verdana, Arial, Helvetica, sans-serif; + font-size:12px; + } + </style> </head> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kas...@us...> - 2008-09-08 02:30:43
|
Revision: 76 http://aconix.svn.sourceforge.net/aconix/?rev=76&view=rev Author: kaskuers Date: 2008-09-08 02:30:53 +0000 (Mon, 08 Sep 2008) Log Message: ----------- change color of category to be purple Modified Paths: -------------- trunk/src/images/Thumbs.db trunk/src/images/kanan-atas.gif trunk/src/images/kiri-atas.gif trunk/src/images/selected-atas.gif trunk/src/images/selected-bawah.gif trunk/src/images/selected-kanan-bawah.gif trunk/src/images/selected-kanan.gif trunk/src/images/selected-kiri-bawah.gif trunk/src/images/selected-kiri.gif trunk/src/template/view/frontpage/detail.vm trunk/src/template/view/frontpage/detailCat.vm trunk/src/template/view/frontpage/index.vm Modified: trunk/src/template/view/frontpage/detail.vm =================================================================== --- trunk/src/template/view/frontpage/detail.vm 2008-09-07 10:08:38 UTC (rev 75) +++ trunk/src/template/view/frontpage/detail.vm 2008-09-08 02:30:53 UTC (rev 76) @@ -144,7 +144,7 @@ <tr> <td width="20" height="42"><img src="../images/aconix/kiri-atas.gif" width="20" height="42" /></td> <td background="../images/aconix/selected-atas.gif" nowrap><strong><font color="#ffffff" size="3">Category</font></strong></td> -<td width="20" height="42"><img src="../images/aconix/kanan-atas.gif" width="19" height="42" /></td> +<td width="20" height="42"><img src="../images/aconix/kanan-atas.gif" width="20" height="42" /></td> </tr> <tr> <td background="../images/aconix/selected-kiri.gif"></td> @@ -171,9 +171,9 @@ <td background="../images/aconix/selected-kanan.gif"></td> </tr> <tr> -<td height="20"><img src="../images/aconix/selected-kiri-bawah.gif" width="20" height="20" /></td> +<td height="20"><img src="../images/aconix/selected-kiri-bawah.gif" /></td> <td background="../images/aconix/selected-bawah.gif"> </td> -<td height="20"><img src="../images/aconix/selected-kanan-bawah.gif" width="19" height="20" /></td> +<td height="20"><img src="../images/aconix/selected-kanan-bawah.gif" /></td> </tr> </table> Modified: trunk/src/template/view/frontpage/detailCat.vm =================================================================== --- trunk/src/template/view/frontpage/detailCat.vm 2008-09-07 10:08:38 UTC (rev 75) +++ trunk/src/template/view/frontpage/detailCat.vm 2008-09-08 02:30:53 UTC (rev 76) @@ -145,7 +145,7 @@ <tr> <td width="20" height="42"><img src="../images/aconix/kiri-atas.gif" width="20" height="42" /></td> <td background="../images/aconix/selected-atas.gif" nowrap><strong><font color="#ffffff" size="3">Category</font></strong></td> -<td width="20" height="42"><img src="../images/aconix/kanan-atas.gif" width="19" height="42" /></td> +<td width="20" height="42"><img src="../images/aconix/kanan-atas.gif" width="20" height="42" /></td> </tr> <tr> <td background="../images/aconix/selected-kiri.gif"></td> @@ -172,9 +172,9 @@ <td background="../images/aconix/selected-kanan.gif"></td> </tr> <tr> -<td height="20"><img src="../images/aconix/selected-kiri-bawah.gif" width="20" height="20" /></td> +<td height="20"><img src="../images/aconix/selected-kiri-bawah.gif" /></td> <td background="../images/aconix/selected-bawah.gif"> </td> -<td height="20"><img src="../images/aconix/selected-kanan-bawah.gif" width="19" height="20" /></td> +<td height="20"><img src="../images/aconix/selected-kanan-bawah.gif" /></td> </tr> </table> Modified: trunk/src/template/view/frontpage/index.vm =================================================================== --- trunk/src/template/view/frontpage/index.vm 2008-09-07 10:08:38 UTC (rev 75) +++ trunk/src/template/view/frontpage/index.vm 2008-09-08 02:30:53 UTC (rev 76) @@ -156,7 +156,7 @@ <tr> <td width="20" height="42"><img src="../images/aconix/kiri-atas.gif" width="20" height="42" /></td> <td background="../images/aconix/selected-atas.gif" nowrap><strong><font color="#ffffff" size="3">Category</font></strong></td> -<td width="20" height="42"><img src="../images/aconix/kanan-atas.gif" width="19" height="42" /></td> +<td width="20" height="42"><img src="../images/aconix/kanan-atas.gif" width="20" height="42" /></td> </tr> <tr> <td background="../images/aconix/selected-kiri.gif"></td> @@ -183,9 +183,9 @@ <td background="../images/aconix/selected-kanan.gif"></td> </tr> <tr> -<td height="20"><img src="../images/aconix/selected-kiri-bawah.gif" width="20" height="20" /></td> +<td height="20"><img src="../images/aconix/selected-kiri-bawah.gif" /></td> <td background="../images/aconix/selected-bawah.gif"> </td> -<td height="20"><img src="../images/aconix/selected-kanan-bawah.gif" width="19" height="20" /></td> +<td height="20"><img src="../images/aconix/selected-kanan-bawah.gif" /></td> </tr> </table> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kas...@us...> - 2008-09-07 10:08:28
|
Revision: 75 http://aconix.svn.sourceforge.net/aconix/?rev=75&view=rev Author: kaskuers Date: 2008-09-07 10:08:38 +0000 (Sun, 07 Sep 2008) Log Message: ----------- edit copyright and "more" Modified Paths: -------------- trunk/src/template/view/frontpage/about.vm trunk/src/template/view/frontpage/detail.vm trunk/src/template/view/frontpage/detailCat.vm trunk/src/template/view/frontpage/index.vm trunk/src/template/view/module/aconix/article/edit.vm Modified: trunk/src/template/view/frontpage/about.vm =================================================================== --- trunk/src/template/view/frontpage/about.vm 2008-09-06 11:54:42 UTC (rev 74) +++ trunk/src/template/view/frontpage/about.vm 2008-09-07 10:08:38 UTC (rev 75) @@ -11,7 +11,7 @@ } .ordered{ position:relative; - width:500px; + width:auto; height:400px; } @@ -72,10 +72,10 @@ </div></td> <td rowspan="3" valign="top" width="5"> </td> - <td width="500" rowspan="3" valign="top"><table width="500" border="0" cellspacing="0" cellpadding="0"> + <td width="100%" rowspan="3" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td><div class="ordered"> - <table width="500" height="400" border="0" cellpadding="0" cellspacing="0"> + <table width="100%" height="400" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="25" height="45"><img src="../images/aconix/ordered-kiri-atas.gif" width="25" height="45" /></td> <td background="../images/aconix/ordered-atas.gif" nowrap><strong><font color="#ffffff" size="3">About Us</font></strong></td> @@ -168,7 +168,7 @@ </div></td> </tr> <tr> - <td colspan="5" align="center">copyright © blueoxygen technology 2000-2008</td> + <td colspan="5" align="center">copyright © Blueoxygen Technology, 2001-2008</td> </tr> </table> </body> Modified: trunk/src/template/view/frontpage/detail.vm =================================================================== --- trunk/src/template/view/frontpage/detail.vm 2008-09-06 11:54:42 UTC (rev 74) +++ trunk/src/template/view/frontpage/detail.vm 2008-09-07 10:08:38 UTC (rev 75) @@ -11,7 +11,7 @@ } .ordered{ position:relative; - width:500px; + width:auto; height:400px; } @@ -72,10 +72,10 @@ </div></td> <td rowspan="3" valign="top" width="5"> </td> - <td width="500" rowspan="3" valign="top"><table width="500" border="0" cellspacing="0" cellpadding="0"> + <td width="100%" rowspan="3" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td><div class="ordered"> - <table width="500" height="400" border="0" cellpadding="0" cellspacing="0"> + <table width="100%" height="400" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="25" height="45"><img src="../images/aconix/ordered-kiri-atas.gif" width="25" height="45" /></td> <td background="../images/aconix/ordered-atas.gif" nowrap><strong><font color="#ffffff" size="3">Articles</font></strong></td> @@ -180,7 +180,7 @@ </div></td> </tr> <tr> - <td colspan="5" align="center">copyright © blueoxygen technology 2000-2008</td> + <td colspan="5" align="center">copyright © Blueoxygen Technology, 2001-2008</td> </tr> </table> </body> Modified: trunk/src/template/view/frontpage/detailCat.vm =================================================================== --- trunk/src/template/view/frontpage/detailCat.vm 2008-09-06 11:54:42 UTC (rev 74) +++ trunk/src/template/view/frontpage/detailCat.vm 2008-09-07 10:08:38 UTC (rev 75) @@ -11,7 +11,7 @@ } .ordered{ position:relative; - width:500px; + width:auto; height:400px; } @@ -72,10 +72,10 @@ </div></td> <td rowspan="3" valign="top" width="5"> </td> - <td width="500" rowspan="3" valign="top"><table width="500" border="0" cellspacing="0" cellpadding="0"> + <td width="100%" rowspan="3" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td><div class="ordered"> - <table width="500" height="400" border="0" cellpadding="0" cellspacing="0"> + <table width="100%" height="400" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="25" height="45"><img src="../images/aconix/ordered-kiri-atas.gif" width="25" height="45" /></td> <td background="../images/aconix/ordered-atas.gif" nowrap><strong><font color="#ffffff" size="3">Articles on $cat</font></strong></td> @@ -181,7 +181,7 @@ </div></td> </tr> <tr> - <td colspan="5" align="center">copyright © blueoxygen technology 2000-2008</td> + <td colspan="5" align="center">copyright © Blueoxygen Technology, 2001-2008</td> </tr> </table> </body> Modified: trunk/src/template/view/frontpage/index.vm =================================================================== --- trunk/src/template/view/frontpage/index.vm 2008-09-06 11:54:42 UTC (rev 74) +++ trunk/src/template/view/frontpage/index.vm 2008-09-07 10:08:38 UTC (rev 75) @@ -11,7 +11,7 @@ } .ordered{ position:relative; - width:500px; + width:auto; height:400px; } @@ -72,10 +72,10 @@ </div></td> <td rowspan="3" valign="top" width="5"> </td> - <td width="500" rowspan="3" valign="top"><table width="500" border="0" cellspacing="0" cellpadding="0"> + <td width="100%" rowspan="3" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td><div class="ordered"> - <table width="500" height="400" border="0" cellpadding="0" cellspacing="0"> + <table width="100%" height="400" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="25" height="45"><img src="../images/aconix/ordered-kiri-atas.gif" width="25" height="45" /></td> <td background="../images/aconix/ordered-atas.gif" nowrap><strong><font color="#ffffff" size="3">Articles</font></strong></td> @@ -100,7 +100,7 @@ <td>Posted By: $ord5.get($r).get($no) Category : $ord4.get($r).get($no) at : $ord2.get($r).get($no)</td> </tr> <tr bgcolor="#ffffff"> - <td>$ord1.get($r).get($no) <a href="../frontpage/detail.action?id=$ord3.get($r).get($no)&name=$nameDesc&pCol.name=index">more...</a></td> + <td>$ord1.get($r).get($no) <a href="../frontpage/detail.action?id=$ord3.get($r).get($no)&name=$nameDesc&pCol.name=index">more</a></td> </tr> #end #set($r = $r + 1) @@ -192,7 +192,7 @@ </div></td> </tr> <tr> - <td colspan="5" align="center">copyright © blueoxygen technology 2000-2008</td> + <td colspan="5" align="center">copyright © Blueoxygen Technology, 2001-2008</td> </tr> </table> </body> Modified: trunk/src/template/view/module/aconix/article/edit.vm =================================================================== --- trunk/src/template/view/module/aconix/article/edit.vm 2008-09-06 11:54:42 UTC (rev 74) +++ trunk/src/template/view/module/aconix/article/edit.vm 2008-09-07 10:08:38 UTC (rev 75) @@ -47,7 +47,7 @@ </tr> <tr bgcolor="#ffffff"> <td align="right">Status :</td> - <td select name="status"> + <td><select name="status"> <option value="0">Incomplete</option> <option value="1">Complete</option> </select> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kas...@us...> - 2008-09-06 11:54:31
|
Revision: 74 http://aconix.svn.sourceforge.net/aconix/?rev=74&view=rev Author: kaskuers Date: 2008-09-06 11:54:42 +0000 (Sat, 06 Sep 2008) Log Message: ----------- Modified Paths: -------------- trunk/src/template/view/frontpage/about.vm trunk/src/template/view/frontpage/detail.vm trunk/src/template/view/frontpage/detailCat.vm Modified: trunk/src/template/view/frontpage/about.vm =================================================================== --- trunk/src/template/view/frontpage/about.vm 2008-09-06 11:38:14 UTC (rev 73) +++ trunk/src/template/view/frontpage/about.vm 2008-09-06 11:54:42 UTC (rev 74) @@ -47,7 +47,7 @@ <table width="200" height="141" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="20" height="35"><img src="../images/aconix/menu-kiri-atas.gif" width="20" height="35" /></td> -<td width="163" background="../images/aconix/menu-atas.gif"><strong><font color="#ffffff" size="3">Menu/font></strong></td> +<td width="163" background="../images/aconix/menu-atas.gif"><strong><font color="#ffffff" size="3">Menu</font></strong></td> <td width="17" height="35"><img src="../images/aconix/menu-kanan-atas.gif" width="17" height="35" /></td> </tr> <tr> Modified: trunk/src/template/view/frontpage/detail.vm =================================================================== --- trunk/src/template/view/frontpage/detail.vm 2008-09-06 11:38:14 UTC (rev 73) +++ trunk/src/template/view/frontpage/detail.vm 2008-09-06 11:54:42 UTC (rev 74) @@ -47,7 +47,7 @@ <table width="200" height="141" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="20" height="35"><img src="../images/aconix/menu-kiri-atas.gif" width="20" height="35" /></td> -<td width="163" background="../images/aconix/menu-atas.gif"><strong><font color="#ffffff" size="3">Menu/font></strong></td> +<td width="163" background="../images/aconix/menu-atas.gif"><strong><font color="#ffffff" size="3">Menu</font></strong></td> <td width="17" height="35"><img src="../images/aconix/menu-kanan-atas.gif" width="17" height="35" /></td> </tr> <tr> Modified: trunk/src/template/view/frontpage/detailCat.vm =================================================================== --- trunk/src/template/view/frontpage/detailCat.vm 2008-09-06 11:38:14 UTC (rev 73) +++ trunk/src/template/view/frontpage/detailCat.vm 2008-09-06 11:54:42 UTC (rev 74) @@ -47,7 +47,7 @@ <table width="200" height="141" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="20" height="35"><img src="../images/aconix/menu-kiri-atas.gif" width="20" height="35" /></td> -<td width="163" background="../images/aconix/menu-atas.gif"><strong><font color="#ffffff" size="3">Menu/font></strong></td> +<td width="163" background="../images/aconix/menu-atas.gif"><strong><font color="#ffffff" size="3">Menu</font></strong></td> <td width="17" height="35"><img src="../images/aconix/menu-kanan-atas.gif" width="17" height="35" /></td> </tr> <tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kas...@us...> - 2008-09-06 11:38:04
|
Revision: 73 http://aconix.svn.sourceforge.net/aconix/?rev=73&view=rev Author: kaskuers Date: 2008-09-06 11:38:14 +0000 (Sat, 06 Sep 2008) Log Message: ----------- New Template Menu Modified Paths: -------------- trunk/src/images/Thumbs.db trunk/src/images/menu-atas.gif trunk/src/images/menu-kanan-atas.gif trunk/src/images/menu-kiri-atas.gif trunk/src/template/view/frontpage/about.vm trunk/src/template/view/frontpage/detail.vm trunk/src/template/view/frontpage/detailCat.vm trunk/src/template/view/frontpage/index.vm Modified: trunk/src/template/view/frontpage/about.vm =================================================================== --- trunk/src/template/view/frontpage/about.vm 2008-09-06 10:59:13 UTC (rev 72) +++ trunk/src/template/view/frontpage/about.vm 2008-09-06 11:38:14 UTC (rev 73) @@ -46,9 +46,9 @@ <td width="200" height="140"><div class="menu"> <table width="200" height="141" border="0" cellpadding="0" cellspacing="0"> <tr> -<td width="20" height="20"><img src="../images/aconix/menu-kiri-atas.gif" width="20" height="20" /></td> -<td width="163" background="../images/aconix/menu-atas.gif"> </td> -<td width="17" height="20"><img src="../images/aconix/menu-kanan-atas.gif" width="17" height="20" /></td> +<td width="20" height="35"><img src="../images/aconix/menu-kiri-atas.gif" width="20" height="35" /></td> +<td width="163" background="../images/aconix/menu-atas.gif"><strong><font color="#ffffff" size="3">Menu/font></strong></td> +<td width="17" height="35"><img src="../images/aconix/menu-kanan-atas.gif" width="17" height="35" /></td> </tr> <tr> <td height="100" background="../images/aconix/menu-kiri.gif"></td> Modified: trunk/src/template/view/frontpage/detail.vm =================================================================== --- trunk/src/template/view/frontpage/detail.vm 2008-09-06 10:59:13 UTC (rev 72) +++ trunk/src/template/view/frontpage/detail.vm 2008-09-06 11:38:14 UTC (rev 73) @@ -46,9 +46,9 @@ <td width="200" height="140"><div class="menu"> <table width="200" height="141" border="0" cellpadding="0" cellspacing="0"> <tr> -<td width="20" height="20"><img src="../images/aconix/menu-kiri-atas.gif" width="20" height="20" /></td> -<td width="163" background="../images/aconix/menu-atas.gif"> </td> -<td width="17" height="20"><img src="../images/aconix/menu-kanan-atas.gif" width="17" height="20" /></td> +<td width="20" height="35"><img src="../images/aconix/menu-kiri-atas.gif" width="20" height="35" /></td> +<td width="163" background="../images/aconix/menu-atas.gif"><strong><font color="#ffffff" size="3">Menu/font></strong></td> +<td width="17" height="35"><img src="../images/aconix/menu-kanan-atas.gif" width="17" height="35" /></td> </tr> <tr> <td height="100" background="../images/aconix/menu-kiri.gif"></td> Modified: trunk/src/template/view/frontpage/detailCat.vm =================================================================== --- trunk/src/template/view/frontpage/detailCat.vm 2008-09-06 10:59:13 UTC (rev 72) +++ trunk/src/template/view/frontpage/detailCat.vm 2008-09-06 11:38:14 UTC (rev 73) @@ -46,9 +46,9 @@ <td width="200" height="140"><div class="menu"> <table width="200" height="141" border="0" cellpadding="0" cellspacing="0"> <tr> -<td width="20" height="20"><img src="../images/aconix/menu-kiri-atas.gif" width="20" height="20" /></td> -<td width="163" background="../images/aconix/menu-atas.gif"> </td> -<td width="17" height="20"><img src="../images/aconix/menu-kanan-atas.gif" width="17" height="20" /></td> +<td width="20" height="35"><img src="../images/aconix/menu-kiri-atas.gif" width="20" height="35" /></td> +<td width="163" background="../images/aconix/menu-atas.gif"><strong><font color="#ffffff" size="3">Menu/font></strong></td> +<td width="17" height="35"><img src="../images/aconix/menu-kanan-atas.gif" width="17" height="35" /></td> </tr> <tr> <td height="100" background="../images/aconix/menu-kiri.gif"></td> Modified: trunk/src/template/view/frontpage/index.vm =================================================================== --- trunk/src/template/view/frontpage/index.vm 2008-09-06 10:59:13 UTC (rev 72) +++ trunk/src/template/view/frontpage/index.vm 2008-09-06 11:38:14 UTC (rev 73) @@ -46,9 +46,9 @@ <td width="200" height="140"><div class="menu"> <table width="200" height="141" border="0" cellpadding="0" cellspacing="0"> <tr> -<td width="20" height="20"><img src="../images/aconix/menu-kiri-atas.gif" width="20" height="20" /></td> -<td width="163" background="../images/aconix/menu-atas.gif"> </td> -<td width="17" height="20"><img src="../images/aconix/menu-kanan-atas.gif" width="17" height="20" /></td> +<td width="20" height="35"><img src="../images/aconix/menu-kiri-atas.gif" width="20" height="35" /></td> +<td width="163" background="../images/aconix/menu-atas.gif"><strong><font color="#ffffff" size="3">Menu</font></strong></td> +<td width="17" height="35"><img src="../images/aconix/menu-kanan-atas.gif" width="17" height="35" /></td> </tr> <tr> <td height="100" background="../images/aconix/menu-kiri.gif"></td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kas...@us...> - 2008-09-06 10:59:03
|
Revision: 72 http://aconix.svn.sourceforge.net/aconix/?rev=72&view=rev Author: kaskuers Date: 2008-09-06 10:59:13 +0000 (Sat, 06 Sep 2008) Log Message: ----------- add new feature : status for article. Modified Paths: -------------- trunk/src/java/org/blueoxygen/aconix/article/action/AddArticle.java trunk/src/java/org/blueoxygen/aconix/frontpage/action/ViewDetail.java trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java trunk/src/template/view/module/aconix/article/ArticleForm.vm trunk/src/template/view/module/aconix/article/edit.vm trunk/src/template/view/module/aconix/article/result.vm Modified: trunk/src/java/org/blueoxygen/aconix/article/action/AddArticle.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/article/action/AddArticle.java 2008-09-03 21:37:03 UTC (rev 71) +++ trunk/src/java/org/blueoxygen/aconix/article/action/AddArticle.java 2008-09-06 10:59:13 UTC (rev 72) @@ -19,6 +19,7 @@ private SessionCredentials sess; private String msg = ""; private String categoryId=""; + private int status; protected ArticleCategory ACategory = new ArticleCategory(); public String execute(){ @@ -52,7 +53,7 @@ ACategory = null; } - logInfo.setActiveFlag(1); + logInfo.setActiveFlag(getStatus()); logInfo.setLastUpdateDate(new Timestamp(System.currentTimeMillis())); article.setName(getArticle().getName()); @@ -86,8 +87,23 @@ public void setACategory(ArticleCategory category) { ACategory = category; } + /** + * @return the status + */ + public int getStatus() { + return status; + } + + /** + * @param status the status to set + */ + public void setStatus(int status) { + this.status = status; + } + + /** * @return the categoryId */ public String getCategoryId() { Modified: trunk/src/java/org/blueoxygen/aconix/frontpage/action/ViewDetail.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/frontpage/action/ViewDetail.java 2008-09-03 21:37:03 UTC (rev 71) +++ trunk/src/java/org/blueoxygen/aconix/frontpage/action/ViewDetail.java 2008-09-06 10:59:13 UTC (rev 72) @@ -105,7 +105,7 @@ } } } - articles = manager.getList("SELECT l FROM "+Article.class.getName()+" l WHERE l.categoryId.id='"+getId()+"'", null, null); + articles = manager.getList("SELECT l FROM "+Article.class.getName()+" l WHERE l.categoryId.id='"+getId()+"' AND l.logInformation.activeFlag='1'", null, null); artAc = (ArticleCategory) manager.getById(ArticleCategory.class, getId()); cat = artAc.getName(); System.out.println(articles); Modified: trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java 2008-09-03 21:37:03 UTC (rev 71) +++ trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java 2008-09-06 10:59:13 UTC (rev 72) @@ -64,7 +64,7 @@ "SELECT * FROM " + m.getDescriptor() .getName() - + " ORDER BY " + + " WHERE active_flag='1' ORDER BY " + m.getOrderedBy() + " DESC LIMIT " + m.getLimitValue()); Modified: trunk/src/template/view/module/aconix/article/ArticleForm.vm =================================================================== --- trunk/src/template/view/module/aconix/article/ArticleForm.vm 2008-09-03 21:37:03 UTC (rev 71) +++ trunk/src/template/view/module/aconix/article/ArticleForm.vm 2008-09-06 10:59:13 UTC (rev 72) @@ -55,6 +55,13 @@ </td> </tr> <tr bgcolor="#ffffff"> + <td align="right">Status :</td> + <td><select name="status"> + <option value="0">Incomplete</option> + <option value="1">Complete</option> + </select></td> + </tr> + <tr bgcolor="#ffffff"> <td align="right">Category :</td> <td><select name="categoryId"> <option value=""> </option> Modified: trunk/src/template/view/module/aconix/article/edit.vm =================================================================== --- trunk/src/template/view/module/aconix/article/edit.vm 2008-09-03 21:37:03 UTC (rev 71) +++ trunk/src/template/view/module/aconix/article/edit.vm 2008-09-06 10:59:13 UTC (rev 72) @@ -46,6 +46,13 @@ </td> </tr> <tr bgcolor="#ffffff"> + <td align="right">Status :</td> + <td select name="status"> + <option value="0">Incomplete</option> + <option value="1">Complete</option> + </select> + </tr> + <tr bgcolor="#ffffff"> <td align="right">Category :</td> <td><select name="categoryId"> <option value=""> </option> Modified: trunk/src/template/view/module/aconix/article/result.vm =================================================================== --- trunk/src/template/view/module/aconix/article/result.vm 2008-09-03 21:37:03 UTC (rev 71) +++ trunk/src/template/view/module/aconix/article/result.vm 2008-09-06 10:59:13 UTC (rev 72) @@ -28,19 +28,21 @@ cellspacing="1" width="98%"> <tbody> <tr bgcolor="#d0dcff"> - <th colspan="3"> + <th colspan="4"> <strong> Article</strong> </th> </tr> <tr bgcolor="#cccccc"> <td>Article Title</td> <td>Category</td> + <td>Status</td> <td>Action</td> </tr> #foreach($SelDel in $articles) <tr bgcolor="#ffffff"> <td>$!SelDel.name</td> <td>$!SelDel.categoryId.name</td> + <td>#if($!SelDel.logInformation.activeFlag == 0)Incomplete #else Complete #end</td> <td><a href="../article/edit.action?article.id=$SelDel.id" title="edit"><img src="../../images/silk/page_edit.png" border="0"></a> <a href="../article/delete.action?article.id=$SelDel.id" title="delete"><img src="../../images/silk/delete.png" border="0"></a></td> </tr> #end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kas...@us...> - 2008-09-03 21:36:57
|
Revision: 71 http://aconix.svn.sourceforge.net/aconix/?rev=71&view=rev Author: kaskuers Date: 2008-09-03 21:37:03 +0000 (Wed, 03 Sep 2008) Log Message: ----------- Modified Paths: -------------- trunk/src/template/view/frontpage/about.vm trunk/src/template/view/frontpage/detail.vm trunk/src/template/view/frontpage/detailCat.vm trunk/src/template/view/frontpage/index.vm Modified: trunk/src/template/view/frontpage/about.vm =================================================================== --- trunk/src/template/view/frontpage/about.vm 2008-09-03 16:23:29 UTC (rev 70) +++ trunk/src/template/view/frontpage/about.vm 2008-09-03 21:37:03 UTC (rev 71) @@ -59,7 +59,7 @@ #else <a href="../backend/user/index.action">Login</a><br /> #end - <a href="../frontpage/about.action">About Us</a> </td> + <a href="../frontpage/about.action?pCol.name=index">About Us</a> </td> <td background="../images/aconix/menu-kanan.gif"></td> </tr> <tr> Modified: trunk/src/template/view/frontpage/detail.vm =================================================================== --- trunk/src/template/view/frontpage/detail.vm 2008-09-03 16:23:29 UTC (rev 70) +++ trunk/src/template/view/frontpage/detail.vm 2008-09-03 21:37:03 UTC (rev 71) @@ -59,7 +59,7 @@ #else <a href="../backend/user/index.action">Login</a><br /> #end - <a href="../frontpage/about.action">About Us</a> </td> + <a href="../frontpage/about.action?pCol.name=index">About Us</a> </td> <td background="../images/aconix/menu-kanan.gif"></td> </tr> <tr> Modified: trunk/src/template/view/frontpage/detailCat.vm =================================================================== --- trunk/src/template/view/frontpage/detailCat.vm 2008-09-03 16:23:29 UTC (rev 70) +++ trunk/src/template/view/frontpage/detailCat.vm 2008-09-03 21:37:03 UTC (rev 71) @@ -59,7 +59,7 @@ #else <a href="../backend/user/index.action">Login</a><br /> #end - <a href="../frontpage/about.action">About Us</a> </td> + <a href="../frontpage/about.action?pCol.name=index">About Us</a> </td> <td background="../images/aconix/menu-kanan.gif"></td> </tr> <tr> Modified: trunk/src/template/view/frontpage/index.vm =================================================================== --- trunk/src/template/view/frontpage/index.vm 2008-09-03 16:23:29 UTC (rev 70) +++ trunk/src/template/view/frontpage/index.vm 2008-09-03 21:37:03 UTC (rev 71) @@ -59,7 +59,7 @@ #else <a href="../backend/user/index.action">Login</a><br /> #end - <a href="../frontpage/about.action">About Us</a> </td> + <a href="../frontpage/about.action?pCol.name=index">About Us</a> </td> <td background="../images/aconix/menu-kanan.gif"></td> </tr> <tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kas...@us...> - 2008-09-03 16:23:29
|
Revision: 70 http://aconix.svn.sourceforge.net/aconix/?rev=70&view=rev Author: kaskuers Date: 2008-09-03 16:23:29 +0000 (Wed, 03 Sep 2008) Log Message: ----------- aconix frontpage updated Modified Paths: -------------- trunk/src/config/struts-aconix.xml trunk/src/images/Thumbs.db trunk/src/template/view/frontpage/detail.vm trunk/src/template/view/frontpage/detailCat.vm trunk/src/template/view/frontpage/index.vm Added Paths: ----------- trunk/src/images/ads-atas.gif trunk/src/images/ads-bawah.gif trunk/src/images/ads-kanan-atas.gif trunk/src/images/ads-kanan-bawah.gif trunk/src/images/ads-kanan.gif trunk/src/images/ads-kiri-atas.gif trunk/src/images/ads-kiri-bawah.gif trunk/src/images/ads-kiri.gif trunk/src/images/menu-atas.gif trunk/src/images/menu-bawah.gif trunk/src/images/menu-kanan-atas.gif trunk/src/images/menu-kanan-bawah.gif trunk/src/images/menu-kanan.gif trunk/src/images/menu-kiri-atas.gif trunk/src/images/menu-kiri-bawah.gif trunk/src/images/menu-kiri.gif trunk/src/template/view/frontpage/about.vm Modified: trunk/src/config/struts-aconix.xml =================================================================== --- trunk/src/config/struts-aconix.xml 2008-09-03 06:15:27 UTC (rev 69) +++ trunk/src/config/struts-aconix.xml 2008-09-03 16:23:29 UTC (rev 70) @@ -184,6 +184,9 @@ </action> <action name="view" class="org.blueoxygen.aconix.frontpage.action.ViewDetail" method="viewByCat"> <result name="success" type="velocity">/view/frontpage/detailCat.vm</result> + </action> + <action name="about" class="org.blueoxygen.aconix.frontpage.action.ViewDetail"> + <result name="success" type="velocity">/view/frontpage/about.vm</result> </action> </package> </struts> \ No newline at end of file Property changes on: trunk/src/images/ads-atas.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/ads-bawah.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/ads-kanan-atas.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/ads-kanan-bawah.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/ads-kanan.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/ads-kiri-atas.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/ads-kiri-bawah.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/ads-kiri.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/menu-atas.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/menu-bawah.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/menu-kanan-atas.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/menu-kanan-bawah.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/menu-kanan.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/menu-kiri-atas.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/menu-kiri-bawah.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/menu-kiri.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/template/view/frontpage/about.vm =================================================================== --- trunk/src/template/view/frontpage/about.vm (rev 0) +++ trunk/src/template/view/frontpage/about.vm 2008-09-03 16:23:29 UTC (rev 70) @@ -0,0 +1,175 @@ +<html> +<head> +<title>Blueoxygen Aconix</title> + ##<link type="text/css" rel="stylesheet" href="../style.css" > + <style type="text/css"> + .selected{ + position:relative; + width:200px; + height:300px; + +} +.ordered{ + position:relative; + width:500px; + height:400px; + +} +.menu{ + position:relative; + width:200px; + height:140px; +} +.image{ + position:relative; + width:200px; + height:54px; +} +.ads{ + position:relative; + width:200px; + height:400px; +} + </style> +</head> + +<body> +<table width="100%" border="0" cellspacing="0" cellpadding="0"> + <tr> + <td width="200" valign="top"><div class="image"><img src="../images/e-business-suite.gif" /></div></td> + <td colspan="4"> </td> + </tr> + <td colspan="5"> </td> + <tr> + </tr> + <tr> + <td width="200" height="140"><div class="menu"> + <table width="200" height="141" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td width="20" height="20"><img src="../images/aconix/menu-kiri-atas.gif" width="20" height="20" /></td> +<td width="163" background="../images/aconix/menu-atas.gif"> </td> +<td width="17" height="20"><img src="../images/aconix/menu-kanan-atas.gif" width="17" height="20" /></td> +</tr> +<tr> +<td height="100" background="../images/aconix/menu-kiri.gif"></td> +<td valign="top"><a href="../frontpage/create.action?pCol.name=index">Home</a><br /> +#if($currentUser) + <a href="../backend/user/logout.action">Logout</a><br /> + <a href="../backend/user/index.action">Workspace</a><br /> +#else + <a href="../backend/user/index.action">Login</a><br /> +#end + <a href="../frontpage/about.action">About Us</a> </td> +<td background="../images/aconix/menu-kanan.gif"></td> +</tr> +<tr> +<td width="20" height="20" valign="top"><img src="../images/aconix/menu-kiri-bawah.gif" width="20" height="18" /></td> +<td background="../images/aconix/menu-bawah.gif" height="20"> </td> +<td width="17" height="20" valign="top"><img src="../images/aconix/menu-kanan-bawah.gif" width="17" height="18" /></td> +</tr> + +</table> + + </div></td> + <td rowspan="3" valign="top" width="5"> </td> + <td width="500" rowspan="3" valign="top"><table width="500" border="0" cellspacing="0" cellpadding="0"> + <tr> + <td><div class="ordered"> + <table width="500" height="400" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td width="25" height="45"><img src="../images/aconix/ordered-kiri-atas.gif" width="25" height="45" /></td> +<td background="../images/aconix/ordered-atas.gif" nowrap><strong><font color="#ffffff" size="3">About Us</font></strong></td> +<td width="25" height="45"><img src="../images/aconix/ordered-kanan-atas.gif" width="25" height="45" /></td> +</tr> +<tr> +<td background="../images/aconix/ordered-kiri.gif"></td> +<td valign="top"> +</td> +<td background="../images/aconix/ordered-kanan.gif"></td> +</tr> +<tr> +<td width="25" height="25"><img src="../images/aconix/ordered-kiri-bawah.gif" width="25" height="25" /></td> +<td background="../images/aconix/ordered-bawah.gif"> </td> +<td width="25" height="25"><img src="../images/aconix/ordered-kanan-bawah.gif" width="25" height="25" /></td> +</tr> + +</table> + + </div></td> + </tr> + </table></td> + <td width="5" rowspan="3"> </td> + <td width="306" rowspan="3" valign="top"><table width="200" border="0" cellspacing="0" cellpadding="0"> + <tr> + <td><div class="ads"> + <table width="200" border="0" cellspacing="0" cellpadding="0" height="400"> + <tr> + <td width="20" height="45"><img src="../images/aconix/ads-kiri-atas.gif" /></td> + <td width="160" background="../images/aconix/ads-atas.gif" nowrap><strong><font color="#ffffff" size="3">Sponsor</font></strong></td> + <td width="20"><img src="../images/aconix/ads-kanan-atas.gif" /></td> + </tr> + <tr> + <td background="../images/aconix/ads-kiri.gif"></td> + <td valign="top"> </td> + <td background="../images/aconix/ads-kanan.gif"></td> + </tr> + <tr> + <td height="18" width="20"><img src="../images/aconix/ads-kiri-bawah.gif" /></td> + <td background="../images/aconix/ads-bawah.gif"></td> + <td width="20"><img src="../images/aconix/ads-kanan-bawah.gif" /></td> + </tr> + </table> + </div></td> + </tr> + </table></td> + </tr> + <tr> + <td> </td> + </tr> + <tr> + <td width="200" height="300" valign="top"><div class="selected"> + <table width="200" height="300" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td width="20" height="42"><img src="../images/aconix/kiri-atas.gif" width="20" height="42" /></td> +<td background="../images/aconix/selected-atas.gif" nowrap><strong><font color="#ffffff" size="3">Category</font></strong></td> +<td width="20" height="42"><img src="../images/aconix/kanan-atas.gif" width="19" height="42" /></td> +</tr> +<tr> +<td background="../images/aconix/selected-kiri.gif"></td> +<td valign="top"><table width="100%" border="0" bgcolor="#ffffff" cellspacing="1" cellpadding="5"> + #foreach($p in $PColDels) + #if($p.collection.collectionSelectedDetails.isEmpty() == false) + +## <th> +## $p.collection.name +## </th> + #foreach($d in $p.collection.collectionSelectedDetails) + + <tr bgcolor="#ffffff"> + <td> + <a href="../frontpage/view.action?id=$d.articleId&pCol.name=index">$d.articleName</a> + </td> + </tr> + #end + #end + #end + + </table> +</td> +<td background="../images/aconix/selected-kanan.gif"></td> +</tr> +<tr> +<td height="20"><img src="../images/aconix/selected-kiri-bawah.gif" width="20" height="20" /></td> +<td background="../images/aconix/selected-bawah.gif"> </td> +<td height="20"><img src="../images/aconix/selected-kanan-bawah.gif" width="19" height="20" /></td> +</tr> +</table> + + </div></td> + </tr> + <tr> + <td colspan="5" align="center">copyright © blueoxygen technology 2000-2008</td> + </tr> +</table> +</body> +</html> Modified: trunk/src/template/view/frontpage/detail.vm =================================================================== --- trunk/src/template/view/frontpage/detail.vm 2008-09-03 06:15:27 UTC (rev 69) +++ trunk/src/template/view/frontpage/detail.vm 2008-09-03 16:23:29 UTC (rev 70) @@ -1,45 +1,150 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> - <head> - <title>BlueOxygen Aconix</title> - <link type="text/css" rel="stylesheet" href="../style.css" > - </head> - <body> - <div class="image"><img src="../images/e-business-suite.gif" /></div> -<div class="menu"> -<table width="200" height="141" border="0" cellpadding="0" cellspacing="0"> +<head> +<title>Blueoxygen Aconix</title> + ##<link type="text/css" rel="stylesheet" href="../style.css" > + <style type="text/css"> + .selected{ + position:relative; + width:200px; + height:300px; + +} +.ordered{ + position:relative; + width:500px; + height:400px; + +} +.menu{ + position:relative; + width:200px; + height:140px; +} +.image{ + position:relative; + width:200px; + height:54px; +} +.ads{ + position:relative; + width:200px; + height:400px; +} + </style> +</head> + +<body> +<table width="100%" border="0" cellspacing="0" cellpadding="0"> + <tr> + <td width="200" valign="top"><div class="image"><img src="../images/e-business-suite.gif" /></div></td> + <td colspan="4"> </td> + </tr> + <td colspan="5"> </td> + <tr> + </tr> + <tr> + <td width="200" height="140"><div class="menu"> + <table width="200" height="141" border="0" cellpadding="0" cellspacing="0"> <tr> -<td width="20" height="20"> </td> -<td width="163"> </td> -<td width="17" height="20"> </td> +<td width="20" height="20"><img src="../images/aconix/menu-kiri-atas.gif" width="20" height="20" /></td> +<td width="163" background="../images/aconix/menu-atas.gif"> </td> +<td width="17" height="20"><img src="../images/aconix/menu-kanan-atas.gif" width="17" height="20" /></td> </tr> <tr> -<td height="100"> </td> -<td valign="top"><a href="../frontpage/create.action?pCol.name=index">Home</a><br /><br /> +<td height="100" background="../images/aconix/menu-kiri.gif"></td> +<td valign="top"><a href="../frontpage/create.action?pCol.name=index">Home</a><br /> #if($currentUser) -<a href="../backend/user/logout.action">Logout</a><br /><br /> -<a href="../backend/user/index.action">Workspace</a><br /><br /> + <a href="../backend/user/logout.action">Logout</a><br /> + <a href="../backend/user/index.action">Workspace</a><br /> #else -<a href="../backend/user/index.action">Login</a><br /><br /> + <a href="../backend/user/index.action">Login</a><br /> #end -<a href="http://home.blueoxygen.org/web/guest/about" target="blank">About Us</a> + <a href="../frontpage/about.action">About Us</a> </td> +<td background="../images/aconix/menu-kanan.gif"></td> +</tr> +<tr> +<td width="20" height="20" valign="top"><img src="../images/aconix/menu-kiri-bawah.gif" width="20" height="18" /></td> +<td background="../images/aconix/menu-bawah.gif" height="20"> </td> +<td width="17" height="20" valign="top"><img src="../images/aconix/menu-kanan-bawah.gif" width="17" height="18" /></td> +</tr> -<td> </td> +</table> + + </div></td> + <td rowspan="3" valign="top" width="5"> </td> + <td width="500" rowspan="3" valign="top"><table width="500" border="0" cellspacing="0" cellpadding="0"> + <tr> + <td><div class="ordered"> + <table width="500" height="400" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td width="25" height="45"><img src="../images/aconix/ordered-kiri-atas.gif" width="25" height="45" /></td> +<td background="../images/aconix/ordered-atas.gif" nowrap><strong><font color="#ffffff" size="3">Articles</font></strong></td> +<td width="25" height="45"><img src="../images/aconix/ordered-kanan-atas.gif" width="25" height="45" /></td> </tr> <tr> -<td width="20" height="20" valign="top"> </td> -<td height="20"> </td> -<td width="17" height="20" valign="top"> </td> +<td background="../images/aconix/ordered-kiri.gif"></td> +<td valign="top"><table width="100%" border="0" bgcolor="#ffffff" cellspacing="1" cellpadding="5"> + + <tr bgcolor="#ffffff"> + <td><strong><font size="3">$title</font></strong></td> + </tr> + <tr bgcolor="#ffffff"> + + <td>Posted By : $us Category : $cat at : $tgl</td> + </tr> + <tr bgcolor="#ffffff"> + <td>$description</td> + </tr> + </table> +</td> +<td background="../images/aconix/ordered-kanan.gif"></td> </tr> +<tr> +<td width="25" height="25"><img src="../images/aconix/ordered-kiri-bawah.gif" width="25" height="25" /></td> +<td background="../images/aconix/ordered-bawah.gif"> </td> +<td width="25" height="25"><img src="../images/aconix/ordered-kanan-bawah.gif" width="25" height="25" /></td> +</tr> </table> -</div> -<div class="selected"> -<table width="200" height="300" border="0" cellpadding="0" cellspacing="0"> + + </div></td> + </tr> + </table></td> + <td width="5" rowspan="3"> </td> + <td width="306" rowspan="3" valign="top"><table width="200" border="0" cellspacing="0" cellpadding="0"> + <tr> + <td><div class="ads"> + <table width="200" border="0" cellspacing="0" cellpadding="0" height="400"> + <tr> + <td width="20" height="45"><img src="../images/aconix/ads-kiri-atas.gif" /></td> + <td width="160" background="../images/aconix/ads-atas.gif" nowrap><strong><font color="#ffffff" size="3">Sponsor</font></strong></td> + <td width="20"><img src="../images/aconix/ads-kanan-atas.gif" /></td> + </tr> + <tr> + <td background="../images/aconix/ads-kiri.gif"></td> + <td valign="top"> </td> + <td background="../images/aconix/ads-kanan.gif"></td> + </tr> + <tr> + <td height="18" width="20"><img src="../images/aconix/ads-kiri-bawah.gif" /></td> + <td background="../images/aconix/ads-bawah.gif"></td> + <td width="20"><img src="../images/aconix/ads-kanan-bawah.gif" /></td> + </tr> + </table> + </div></td> + </tr> + </table></td> + </tr> + <tr> + <td> </td> + </tr> + <tr> + <td width="200" height="300" valign="top"><div class="selected"> + <table width="200" height="300" border="0" cellpadding="0" cellspacing="0"> <tr> -<td width="20" height="42"><img src="../images/aconix/kiri-atas.gif" /></td> +<td width="20" height="42"><img src="../images/aconix/kiri-atas.gif" width="20" height="42" /></td> <td background="../images/aconix/selected-atas.gif" nowrap><strong><font color="#ffffff" size="3">Category</font></strong></td> -<td width="20" height="42"><img src="../images/aconix/kanan-atas.gif" /></td> +<td width="20" height="42"><img src="../images/aconix/kanan-atas.gif" width="19" height="42" /></td> </tr> <tr> <td background="../images/aconix/selected-kiri.gif"></td> @@ -66,48 +171,17 @@ <td background="../images/aconix/selected-kanan.gif"></td> </tr> <tr> -<td height="20"><img src="../images/aconix/selected-kiri-bawah.gif" /></td> +<td height="20"><img src="../images/aconix/selected-kiri-bawah.gif" width="20" height="20" /></td> <td background="../images/aconix/selected-bawah.gif"> </td> -<td height="20"><img src="../images/aconix/selected-kanan-bawah.gif" /></td> +<td height="20"><img src="../images/aconix/selected-kanan-bawah.gif" width="19" height="20" /></td> </tr> - </table> -</div> -<div class="ordered"> -<table width="500" height="400" border="0" cellpadding="0" cellspacing="0"> -<tr> -<td width="25" height="45"><img src="../images/aconix/ordered-kiri-atas.gif" /></td> -<td background="../images/aconix/ordered-atas.gif" nowrap><strong><font color="#ffffff" size="3">Articles</font></strong></td> -<td width="25" height="45"><img src="../images/aconix/ordered-kanan-atas.gif" /></td> -</tr> -<tr> -<td background="../images/aconix/ordered-kiri.gif"></td> -<td valign="top"><table width="100%" border="0" bgcolor="#ffffff" cellspacing="1" cellpadding="5"> - - <tr bgcolor="#ffffff"> - <td><strong><font size="3">$title</font></strong></td> - </tr> - <tr bgcolor="#ffffff"> - - <td>Posted By : $us Category : $cat at : $tgl</td> - </tr> - <tr bgcolor="#ffffff"> - <td>$description</td> - </tr> - </table> -</td> -<td background="../images/aconix/ordered-kanan.gif"></td> -</tr> -<tr> -<td width="25" height="25"><img src="../images/aconix/ordered-kiri-bawah.gif" /></td> -<td background="../images/aconix/ordered-bawah.gif"> </td> -<td width="25" height="25"><img src="../images/aconix/ordered-kanan-bawah.gif" /></td> -</tr> + </div></td> + </tr> + <tr> + <td colspan="5" align="center">copyright © blueoxygen technology 2000-2008</td> + </tr> </table> -</div> - - </body> +</body> </html> - - Modified: trunk/src/template/view/frontpage/detailCat.vm =================================================================== --- trunk/src/template/view/frontpage/detailCat.vm 2008-09-03 06:15:27 UTC (rev 69) +++ trunk/src/template/view/frontpage/detailCat.vm 2008-09-03 16:23:29 UTC (rev 70) @@ -1,45 +1,151 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> - <head> - <title>BlueOxygen Aconix</title> - <link type="text/css" rel="stylesheet" href="../style.css" > - </head> - <body> - <div class="image"><img src="../images/e-business-suite.gif" /></div> -<div class="menu"> -<table width="200" height="141" border="0" cellpadding="0" cellspacing="0"> +<head> +<title>Blueoxygen Aconix</title> + ##<link type="text/css" rel="stylesheet" href="../style.css" > + <style type="text/css"> + .selected{ + position:relative; + width:200px; + height:300px; + +} +.ordered{ + position:relative; + width:500px; + height:400px; + +} +.menu{ + position:relative; + width:200px; + height:140px; +} +.image{ + position:relative; + width:200px; + height:54px; +} +.ads{ + position:relative; + width:200px; + height:400px; +} + </style> +</head> + +<body> +<table width="100%" border="0" cellspacing="0" cellpadding="0"> + <tr> + <td width="200" valign="top"><div class="image"><img src="../images/e-business-suite.gif" /></div></td> + <td colspan="4"> </td> + </tr> + <td colspan="5"> </td> + <tr> + </tr> + <tr> + <td width="200" height="140"><div class="menu"> + <table width="200" height="141" border="0" cellpadding="0" cellspacing="0"> <tr> -<td width="20" height="20"> </td> -<td width="163"> </td> -<td width="17" height="20"> </td> +<td width="20" height="20"><img src="../images/aconix/menu-kiri-atas.gif" width="20" height="20" /></td> +<td width="163" background="../images/aconix/menu-atas.gif"> </td> +<td width="17" height="20"><img src="../images/aconix/menu-kanan-atas.gif" width="17" height="20" /></td> </tr> <tr> -<td height="100"> </td> -<td valign="top"><a href="../frontpage/create.action?pCol.name=index">Home</a><br /><br /> +<td height="100" background="../images/aconix/menu-kiri.gif"></td> +<td valign="top"><a href="../frontpage/create.action?pCol.name=index">Home</a><br /> #if($currentUser) -<a href="../backend/user/logout.action">Logout</a><br /><br /> -<a href="../backend/user/index.action">Workspace</a><br /><br /> + <a href="../backend/user/logout.action">Logout</a><br /> + <a href="../backend/user/index.action">Workspace</a><br /> #else -<a href="../backend/user/index.action">Login</a><br /><br /> + <a href="../backend/user/index.action">Login</a><br /> #end -<a href="http://home.blueoxygen.org/web/guest/about" target="blank">About Us</a> + <a href="../frontpage/about.action">About Us</a> </td> +<td background="../images/aconix/menu-kanan.gif"></td> +</tr> +<tr> +<td width="20" height="20" valign="top"><img src="../images/aconix/menu-kiri-bawah.gif" width="20" height="18" /></td> +<td background="../images/aconix/menu-bawah.gif" height="20"> </td> +<td width="17" height="20" valign="top"><img src="../images/aconix/menu-kanan-bawah.gif" width="17" height="18" /></td> +</tr> -<td> </td> +</table> + + </div></td> + <td rowspan="3" valign="top" width="5"> </td> + <td width="500" rowspan="3" valign="top"><table width="500" border="0" cellspacing="0" cellpadding="0"> + <tr> + <td><div class="ordered"> + <table width="500" height="400" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td width="25" height="45"><img src="../images/aconix/ordered-kiri-atas.gif" width="25" height="45" /></td> +<td background="../images/aconix/ordered-atas.gif" nowrap><strong><font color="#ffffff" size="3">Articles on $cat</font></strong></td> +<td width="25" height="45"><img src="../images/aconix/ordered-kanan-atas.gif" width="25" height="45" /></td> </tr> <tr> -<td width="20" height="20" valign="top"> </td> -<td height="20"> </td> -<td width="17" height="20" valign="top"> </td> +<td background="../images/aconix/ordered-kiri.gif"></td> +<td valign="top"><table width="100%" border="0" bgcolor="#ffffff" cellspacing="1" cellpadding="5"> + #foreach($viewCat in $articles) + <tr bgcolor="#ffffff"> + <td><strong><font size="3">$viewCat.name</font></strong></td> + </tr> + <tr bgcolor="#ffffff"> + + <td>Posted By : $us Category : $viewCat.categoryId.name at : $viewCat.logInformation.createDate</td> + </tr> + <tr bgcolor="#ffffff"> + <td>$viewCat.description</td> + </tr> + #end + </table> +</td> +<td background="../images/aconix/ordered-kanan.gif"></td> </tr> +<tr> +<td width="25" height="25"><img src="../images/aconix/ordered-kiri-bawah.gif" width="25" height="25" /></td> +<td background="../images/aconix/ordered-bawah.gif"> </td> +<td width="25" height="25"><img src="../images/aconix/ordered-kanan-bawah.gif" width="25" height="25" /></td> +</tr> </table> -</div> -<div class="selected"> -<table width="200" height="300" border="0" cellpadding="0" cellspacing="0"> + + </div></td> + </tr> + </table></td> + <td width="5" rowspan="3"> </td> + <td width="306" rowspan="3" valign="top"><table width="200" border="0" cellspacing="0" cellpadding="0"> + <tr> + <td><div class="ads"> + <table width="200" border="0" cellspacing="0" cellpadding="0" height="400"> + <tr> + <td width="20" height="45"><img src="../images/aconix/ads-kiri-atas.gif" /></td> + <td width="160" background="../images/aconix/ads-atas.gif" nowrap><strong><font color="#ffffff" size="3">Sponsor</font></strong></td> + <td width="20"><img src="../images/aconix/ads-kanan-atas.gif" /></td> + </tr> + <tr> + <td background="../images/aconix/ads-kiri.gif"></td> + <td valign="top"> </td> + <td background="../images/aconix/ads-kanan.gif"></td> + </tr> + <tr> + <td height="18" width="20"><img src="../images/aconix/ads-kiri-bawah.gif" /></td> + <td background="../images/aconix/ads-bawah.gif"></td> + <td width="20"><img src="../images/aconix/ads-kanan-bawah.gif" /></td> + </tr> + </table> + </div></td> + </tr> + </table></td> + </tr> + <tr> + <td> </td> + </tr> + <tr> + <td width="200" height="300" valign="top"><div class="selected"> + <table width="200" height="300" border="0" cellpadding="0" cellspacing="0"> <tr> -<td width="20" height="42"><img src="../images/aconix/kiri-atas.gif" /></td> +<td width="20" height="42"><img src="../images/aconix/kiri-atas.gif" width="20" height="42" /></td> <td background="../images/aconix/selected-atas.gif" nowrap><strong><font color="#ffffff" size="3">Category</font></strong></td> -<td width="20" height="42"><img src="../images/aconix/kanan-atas.gif" /></td> +<td width="20" height="42"><img src="../images/aconix/kanan-atas.gif" width="19" height="42" /></td> </tr> <tr> <td background="../images/aconix/selected-kiri.gif"></td> @@ -66,49 +172,17 @@ <td background="../images/aconix/selected-kanan.gif"></td> </tr> <tr> -<td height="20"><img src="../images/aconix/selected-kiri-bawah.gif" /></td> +<td height="20"><img src="../images/aconix/selected-kiri-bawah.gif" width="20" height="20" /></td> <td background="../images/aconix/selected-bawah.gif"> </td> -<td height="20"><img src="../images/aconix/selected-kanan-bawah.gif" /></td> +<td height="20"><img src="../images/aconix/selected-kanan-bawah.gif" width="19" height="20" /></td> </tr> - </table> -</div> -<div class="ordered"> -<table width="500" height="400" border="0" cellpadding="0" cellspacing="0"> -<tr> -<td width="25" height="45"><img src="../images/aconix/ordered-kiri-atas.gif" /></td> -<td background="../images/aconix/ordered-atas.gif" nowrap><strong><font color="#ffffff" size="3">Articles on $cat</font></strong></td> -<td width="25" height="45"><img src="../images/aconix/ordered-kanan-atas.gif" /></td> -</tr> -<tr> -<td background="../images/aconix/ordered-kiri.gif"></td> -<td valign="top"><table width="100%" border="0" bgcolor="#ffffff" cellspacing="1" cellpadding="5"> - #foreach($viewCat in $articles) - <tr bgcolor="#ffffff"> - <td><strong><font size="3">$viewCat.name</font></strong></td> - </tr> - <tr bgcolor="#ffffff"> - - <td>Posted By : $us Category : $viewCat.categoryId.name at : $viewCat.logInformation.createDate</td> - </tr> - <tr bgcolor="#ffffff"> - <td>$viewCat.description</td> - </tr> - #end - </table> -</td> -<td background="../images/aconix/ordered-kanan.gif"></td> -</tr> -<tr> -<td width="25" height="25"><img src="../images/aconix/ordered-kiri-bawah.gif" /></td> -<td background="../images/aconix/ordered-bawah.gif"> </td> -<td width="25" height="25"><img src="../images/aconix/ordered-kanan-bawah.gif" /></td> -</tr> + </div></td> + </tr> + <tr> + <td colspan="5" align="center">copyright © blueoxygen technology 2000-2008</td> + </tr> </table> -</div> - - </body> +</body> </html> - - Modified: trunk/src/template/view/frontpage/index.vm =================================================================== --- trunk/src/template/view/frontpage/index.vm 2008-09-03 06:15:27 UTC (rev 69) +++ trunk/src/template/view/frontpage/index.vm 2008-09-03 16:23:29 UTC (rev 70) @@ -1,125 +1,199 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html> - <head> - <title>BlueOxygen Aconix</title> - <link type="text/css" rel="stylesheet" href="../style.css" > - </head> - <body> - <div class="image"><img src="../images/e-business-suite.gif" /></div> -<div class="menu"> -<table width="200" height="141" border="0" cellpadding="0" cellspacing="0"> -<tr> -<td width="20" height="20"> </td> -<td width="163"> </td> -<td width="17" height="20"> </td> -</tr> -<tr> -<td height="100"> </td> -<td valign="top"><a href="../frontpage/create.action?pCol.name=index">Home</a><br /><br /> -#if($currentUser) -<a href="../backend/user/logout.action">Logout</a><br /><br /> -<a href="../backend/user/index.action">Workspace</a><br /><br /> -#else -<a href="../backend/user/index.action">Login</a><br /><br /> -#end -<a href="http://home.blueoxygen.org/web/guest/about" target="blank">About Us</a> - -<td> </td> -</tr> -<tr> -<td width="20" height="20" valign="top"> </td> -<td height="20"> </td> -<td width="17" height="20" valign="top"> </td> -</tr> - -</table> -</div> -<div class="selected"> -<table width="200" height="300" border="0" cellpadding="0" cellspacing="0"> -<tr> -<td width="20" height="42"><img src="../images/aconix/kiri-atas.gif" /></td> -<td background="../images/aconix/selected-atas.gif" nowrap><strong><font color="#ffffff" size="3">Category</font></strong></td> -<td width="20" height="42"><img src="../images/aconix/kanan-atas.gif" /></td> -</tr> -<tr> -<td background="../images/aconix/selected-kiri.gif"></td> -<td valign="top"><table width="100%" border="0" bgcolor="#ffffff" cellspacing="1" cellpadding="5"> - #foreach($p in $PColDels) - #if($p.collection.collectionSelectedDetails.isEmpty() == false) - -## <th> -## $p.collection.name -## </th> - #foreach($d in $p.collection.collectionSelectedDetails) - - <tr bgcolor="#ffffff"> - <td> - <a href="../frontpage/view.action?id=$d.articleId&pCol.name=index">$d.articleName</a> - </td> - </tr> - #end - #end - #end - - </table> -</td> -<td background="../images/aconix/selected-kanan.gif"></td> -</tr> -<tr> -<td height="20"><img src="../images/aconix/selected-kiri-bawah.gif" /></td> -<td background="../images/aconix/selected-bawah.gif"> </td> -<td height="20"><img src="../images/aconix/selected-kanan-bawah.gif" /></td> -</tr> - -</table> -</div> -<div class="ordered"> -<table width="500" height="400" border="0" cellpadding="0" cellspacing="0"> -<tr> -<td width="25" height="45"><img src="../images/aconix/ordered-kiri-atas.gif" /></td> -<td background="../images/aconix/ordered-atas.gif" nowrap><strong><font color="#ffffff" size="3">Articles</font></strong></td> -<td width="25" height="45"><img src="../images/aconix/ordered-kanan-atas.gif" /></td> -</tr> -<tr> -<td background="../images/aconix/ordered-kiri.gif"></td> -<td valign="top"><table width="100%" border="0" bgcolor="#ffffff" cellspacing="1" cellpadding="5"> - #set($r = 0) - #foreach($y in $PColDels) - #if($y.collection.collectionDescriptors.isEmpty() == false) -## <th> -## $y.collection.name -## </th> - - #foreach($e in $ord.get($r)) - <tr bgcolor="#ffffff"> - <td><strong><font size="3">$e</font></strong></td> - </tr> - <tr bgcolor="#ffffff"> - #set($no = $velocityCount - 1) - <td>Posted By: $ord5.get($r).get($no) Category : $ord4.get($r).get($no) at : $ord2.get($r).get($no)</td> - </tr> - <tr bgcolor="#ffffff"> - <td>$ord1.get($r).get($no) <a href="../frontpage/detail.action?id=$ord3.get($r).get($no)&name=$nameDesc&pCol.name=index">more...</a></td> - </tr> - #end - #set($r = $r + 1) - #end - #end - - </table> -</td> -<td background="../images/aconix/ordered-kanan.gif"></td> -</tr> -<tr> -<td width="25" height="25"><img src="../images/aconix/ordered-kiri-bawah.gif" /></td> -<td background="../images/aconix/ordered-bawah.gif"> </td> -<td width="25" height="25"><img src="../images/aconix/ordered-kanan-bawah.gif" /></td> -</tr> - -</table> -</div> - - </body> -</html> - - +<html> +<head> +<title>Blueoxygen Aconix</title> + ##<link type="text/css" rel="stylesheet" href="../style.css" > + <style type="text/css"> + .selected{ + position:relative; + width:200px; + height:300px; + +} +.ordered{ + position:relative; + width:500px; + height:400px; + +} +.menu{ + position:relative; + width:200px; + height:140px; +} +.image{ + position:relative; + width:200px; + height:54px; +} +.ads{ + position:relative; + width:200px; + height:400px; +} + </style> +</head> + +<body> +<table width="100%" border="0" cellspacing="0" cellpadding="0"> + <tr> + <td width="200" valign="top"><div class="image"><img src="../images/e-business-suite.gif" /></div></td> + <td colspan="4"> </td> + </tr> + <td colspan="5"> </td> + <tr> + </tr> + <tr> + <td width="200" height="140"><div class="menu"> + <table width="200" height="141" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td width="20" height="20"><img src="../images/aconix/menu-kiri-atas.gif" width="20" height="20" /></td> +<td width="163" background="../images/aconix/menu-atas.gif"> </td> +<td width="17" height="20"><img src="../images/aconix/menu-kanan-atas.gif" width="17" height="20" /></td> +</tr> +<tr> +<td height="100" background="../images/aconix/menu-kiri.gif"></td> +<td valign="top"><a href="../frontpage/create.action?pCol.name=index">Home</a><br /> +#if($currentUser) + <a href="../backend/user/logout.action">Logout</a><br /> + <a href="../backend/user/index.action">Workspace</a><br /> +#else + <a href="../backend/user/index.action">Login</a><br /> +#end + <a href="../frontpage/about.action">About Us</a> </td> +<td background="../images/aconix/menu-kanan.gif"></td> +</tr> +<tr> +<td width="20" height="20" valign="top"><img src="../images/aconix/menu-kiri-bawah.gif" width="20" height="18" /></td> +<td background="../images/aconix/menu-bawah.gif" height="20"> </td> +<td width="17" height="20" valign="top"><img src="../images/aconix/menu-kanan-bawah.gif" width="17" height="18" /></td> +</tr> + +</table> + + </div></td> + <td rowspan="3" valign="top" width="5"> </td> + <td width="500" rowspan="3" valign="top"><table width="500" border="0" cellspacing="0" cellpadding="0"> + <tr> + <td><div class="ordered"> + <table width="500" height="400" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td width="25" height="45"><img src="../images/aconix/ordered-kiri-atas.gif" width="25" height="45" /></td> +<td background="../images/aconix/ordered-atas.gif" nowrap><strong><font color="#ffffff" size="3">Articles</font></strong></td> +<td width="25" height="45"><img src="../images/aconix/ordered-kanan-atas.gif" width="25" height="45" /></td> +</tr> +<tr> +<td background="../images/aconix/ordered-kiri.gif"></td> +<td valign="top"><table width="100%" border="0" bgcolor="#ffffff" cellspacing="1" cellpadding="5"> + #set($r = 0) + #foreach($y in $PColDels) + #if($y.collection.collectionDescriptors.isEmpty() == false) +## <th> +## $y.collection.name +## </th> + + #foreach($e in $ord.get($r)) + <tr bgcolor="#ffffff"> + <td><strong><font size="3">$e</font></strong></td> + </tr> + <tr bgcolor="#ffffff"> + #set($no = $velocityCount - 1) + <td>Posted By: $ord5.get($r).get($no) Category : $ord4.get($r).get($no) at : $ord2.get($r).get($no)</td> + </tr> + <tr bgcolor="#ffffff"> + <td>$ord1.get($r).get($no) <a href="../frontpage/detail.action?id=$ord3.get($r).get($no)&name=$nameDesc&pCol.name=index">more...</a></td> + </tr> + #end + #set($r = $r + 1) + #end + #end + + </table> +</td> +<td background="../images/aconix/ordered-kanan.gif"></td> +</tr> +<tr> +<td width="25" height="25"><img src="../images/aconix/ordered-kiri-bawah.gif" width="25" height="25" /></td> +<td background="../images/aconix/ordered-bawah.gif"> </td> +<td width="25" height="25"><img src="../images/aconix/ordered-kanan-bawah.gif" width="25" height="25" /></td> +</tr> + +</table> + + </div></td> + </tr> + </table></td> + <td width="5" rowspan="3"> </td> + <td width="306" rowspan="3" valign="top"><table width="200" border="0" cellspacing="0" cellpadding="0"> + <tr> + <td><div class="ads"> + <table width="200" border="0" cellspacing="0" cellpadding="0" height="400"> + <tr> + <td width="20" height="45"><img src="../images/aconix/ads-kiri-atas.gif" /></td> + <td width="160" background="../images/aconix/ads-atas.gif" nowrap><strong><font color="#ffffff" size="3">Sponsor</font></strong></td> + <td width="20"><img src="../images/aconix/ads-kanan-atas.gif" /></td> + </tr> + <tr> + <td background="../images/aconix/ads-kiri.gif"></td> + <td valign="top"> </td> + <td background="../images/aconix/ads-kanan.gif"></td> + </tr> + <tr> + <td height="18" width="20"><img src="../images/aconix/ads-kiri-bawah.gif" /></td> + <td background="../images/aconix/ads-bawah.gif"></td> + <td width="20"><img src="../images/aconix/ads-kanan-bawah.gif" /></td> + </tr> + </table> + </div></td> + </tr> + </table></td> + </tr> + <tr> + <td> </td> + </tr> + <tr> + <td width="200" height="300" valign="top"><div class="selected"> + <table width="200" height="300" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td width="20" height="42"><img src="../images/aconix/kiri-atas.gif" width="20" height="42" /></td> +<td background="../images/aconix/selected-atas.gif" nowrap><strong><font color="#ffffff" size="3">Category</font></strong></td> +<td width="20" height="42"><img src="../images/aconix/kanan-atas.gif" width="19" height="42" /></td> +</tr> +<tr> +<td background="../images/aconix/selected-kiri.gif"></td> +<td valign="top"><table width="100%" border="0" bgcolor="#ffffff" cellspacing="1" cellpadding="5"> + #foreach($p in $PColDels) + #if($p.collection.collectionSelectedDetails.isEmpty() == false) + +## <th> +## $p.collection.name +## </th> + #foreach($d in $p.collection.collectionSelectedDetails) + + <tr bgcolor="#ffffff"> + <td> + <a href="../frontpage/view.action?id=$d.articleId&pCol.name=index">$d.articleName</a> + </td> + </tr> + #end + #end + #end + + </table> +</td> +<td background="../images/aconix/selected-kanan.gif"></td> +</tr> +<tr> +<td height="20"><img src="../images/aconix/selected-kiri-bawah.gif" width="20" height="20" /></td> +<td background="../images/aconix/selected-bawah.gif"> </td> +<td height="20"><img src="../images/aconix/selected-kanan-bawah.gif" width="19" height="20" /></td> +</tr> +</table> + + </div></td> + </tr> + <tr> + <td colspan="5" align="center">copyright © blueoxygen technology 2000-2008</td> + </tr> +</table> +</body> +</html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kas...@us...> - 2008-09-03 06:15:17
|
Revision: 69 http://aconix.svn.sourceforge.net/aconix/?rev=69&view=rev Author: kaskuers Date: 2008-09-03 06:15:27 +0000 (Wed, 03 Sep 2008) Log Message: ----------- deleted src image for menu Removed Paths: ------------- trunk/src/images/background.gif trunk/src/images/menu-kanan-atas.gif trunk/src/images/menu-kanan-bawah.gif trunk/src/images/menu-kiri-atas.gif trunk/src/images/menu-kiri-bawah.gif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kas...@us...> - 2008-09-01 11:25:34
|
Revision: 68 http://aconix.svn.sourceforge.net/aconix/?rev=68&view=rev Author: kaskuers Date: 2008-09-01 11:25:40 +0000 (Mon, 01 Sep 2008) Log Message: ----------- Revision II : Frontpage Detail Article View article by category Modified Paths: -------------- trunk/src/config/struts-aconix.xml trunk/src/java/org/blueoxygen/aconix/frontpage/action/ViewDetail.java trunk/src/java/org/blueoxygen/aconix/pageCollection/action/PageCollectionForm.java trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java trunk/src/template/view/frontpage/detail.vm trunk/src/template/view/frontpage/index.vm Added Paths: ----------- trunk/src/template/view/frontpage/detailCat.vm Modified: trunk/src/config/struts-aconix.xml =================================================================== --- trunk/src/config/struts-aconix.xml 2008-09-01 04:50:32 UTC (rev 67) +++ trunk/src/config/struts-aconix.xml 2008-09-01 11:25:40 UTC (rev 68) @@ -179,8 +179,11 @@ <action name="create" class="org.blueoxygen.aconix.pageCollection.action.Preview"> <result name="success" type="velocity">/view/frontpage/index.vm</result> </action> - <action name="view" class="org.blueoxygen.aconix.frontpage.action.ViewDetail"> + <action name="detail" class="org.blueoxygen.aconix.frontpage.action.ViewDetail"> <result name="success" type="velocity">/view/frontpage/detail.vm</result> </action> + <action name="view" class="org.blueoxygen.aconix.frontpage.action.ViewDetail" method="viewByCat"> + <result name="success" type="velocity">/view/frontpage/detailCat.vm</result> + </action> </package> </struts> \ No newline at end of file Modified: trunk/src/java/org/blueoxygen/aconix/frontpage/action/ViewDetail.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/frontpage/action/ViewDetail.java 2008-09-01 04:50:32 UTC (rev 67) +++ trunk/src/java/org/blueoxygen/aconix/frontpage/action/ViewDetail.java 2008-09-01 11:25:40 UTC (rev 68) @@ -8,9 +8,18 @@ import java.util.ArrayList; import java.util.List; +import javax.smartcardio.ATR; + +import org.blueoxygen.aconix.entity.ACollection; +import org.blueoxygen.aconix.entity.Article; +import org.blueoxygen.aconix.entity.ArticleCategory; +import org.blueoxygen.aconix.entity.CollectionSelectedDetail; +import org.blueoxygen.aconix.entity.PageCollection; +import org.blueoxygen.aconix.entity.PageCollectionDetail; import org.blueoxygen.cimande.CimandeAction; import org.blueoxygen.cimande.persistence.PersistenceAware; import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactory; +import org.blueoxygen.cimande.security.User; import org.hibernate.HibernateException; /** @@ -24,10 +33,37 @@ private String title =""; private String description=""; private String tgl = ""; + private String us = ""; + private String cat = ""; + private User user = new User(); + private ArticleCategory artAc = new ArticleCategory(); + protected PageCollection pCol = new PageCollection(); + protected PageCollectionDetail pColDel = new PageCollectionDetail(); + protected List<PageCollection> pCols = new ArrayList<PageCollection>(); + protected List<PageCollectionDetail> pColDels = new ArrayList<PageCollectionDetail>(); + private Article article = new Article(); + private List<Article> articles = new ArrayList<Article>(); + public String execute() { //if (!getId().equalsIgnoreCase("") && getId() != null) { - System.out.println(getId()+" = "+getName()); + setPColDels(manager.getList( + "SELECT u FROM " + PageCollectionDetail.class.getName() + + " u WHERE u.pageCollection.name='" + + getPCol().getName() + "'", null, null)); + if (!getPColDels().isEmpty()) { + for (PageCollectionDetail s : getPColDels()) { + ACollection coll = s.getCollection(); + if (!coll.getCollectionSelectedDetails().isEmpty()) { + for (CollectionSelectedDetail e : coll + .getCollectionSelectedDetails()) { + + + } + } + } + } + try { ResultSet con = hsf.createSession().connection() .createStatement().executeQuery("SELECT * FROM " + getName() + " WHERE id='"+ getId() + "'"); @@ -36,6 +72,11 @@ title = con.getString("name"); description = con.getString("description"); tgl = con.getString("create_date"); + user = (User) manager.getById(User.class, con.getString("create_by")); + us = user.getUsername(); + artAc = (ArticleCategory) manager.getById(ArticleCategory.class, con.getString("category_id")); + cat = artAc.getName(); + } } catch (HibernateException e) { e.printStackTrace(); @@ -46,7 +87,65 @@ //} return SUCCESS; } + + public String viewByCat(){ + setPColDels(manager.getList( + "SELECT u FROM " + PageCollectionDetail.class.getName() + + " u WHERE u.pageCollection.name='" + + getPCol().getName() + "'", null, null)); + if (!getPColDels().isEmpty()) { + for (PageCollectionDetail s : getPColDels()) { + ACollection coll = s.getCollection(); + if (!coll.getCollectionSelectedDetails().isEmpty()) { + for (CollectionSelectedDetail e : coll + .getCollectionSelectedDetails()) { + + + } + } + } + } + articles = manager.getList("SELECT l FROM "+Article.class.getName()+" l WHERE l.categoryId.id='"+getId()+"'", null, null); + artAc = (ArticleCategory) manager.getById(ArticleCategory.class, getId()); + cat = artAc.getName(); + System.out.println(articles); + if(!articles.isEmpty()){ + for(Article e : articles){ + user = (User) manager.getById(User.class, e.getLogInformation().getCreateBy()); + us = user.getUsername(); + } + } + + + + return SUCCESS; + } + + + public Article getArticle() { + return article; + } + public void setArticle(Article article) { + this.article = article; + } + + public List<Article> getArticles() { + return articles; + } + + public void setArticles(List<Article> articles) { + this.articles = articles; + } + + public String getCat() { + return cat; + } + + public void setCat(String cat) { + this.cat = cat; + } + public String getName() { return name; } @@ -94,8 +193,67 @@ public void setHsf(HibernateSessionFactory hsf) { this.hsf = hsf; } + + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } + + public String getUs() { + return us; + } + + public void setUs(String us) { + this.us = us; + } + + public ArticleCategory getArtAc() { + return artAc; + } + + public void setArtAc(ArticleCategory artAc) { + this.artAc = artAc; + } + + public PageCollection getPCol() { + return pCol; + } + + public void setPCol(PageCollection col) { + pCol = col; + } + + public PageCollectionDetail getPColDel() { + return pColDel; + } + + public void setPColDel(PageCollectionDetail colDel) { + pColDel = colDel; + } + + public List<PageCollection> getPCols() { + return pCols; + } + + public void setPCols(List<PageCollection> cols) { + pCols = cols; + } + + public List<PageCollectionDetail> getPColDels() { + return pColDels; + } + + public void setPColDels(List<PageCollectionDetail> colDels) { + pColDels = colDels; + } + + + } Modified: trunk/src/java/org/blueoxygen/aconix/pageCollection/action/PageCollectionForm.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/pageCollection/action/PageCollectionForm.java 2008-09-01 04:50:32 UTC (rev 67) +++ trunk/src/java/org/blueoxygen/aconix/pageCollection/action/PageCollectionForm.java 2008-09-01 11:25:40 UTC (rev 68) @@ -9,6 +9,7 @@ import org.blueoxygen.aconix.entity.ACollection; import org.blueoxygen.aconix.entity.Article; +import org.blueoxygen.aconix.entity.ArticleCategory; import org.blueoxygen.aconix.entity.CollectionDescriptor; import org.blueoxygen.aconix.entity.CollectionSelectedDetail; import org.blueoxygen.aconix.entity.PageCollection; @@ -18,6 +19,7 @@ import org.blueoxygen.cimande.persistence.PersistenceManager; import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactory; import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactoryAware; +import org.blueoxygen.cimande.security.User; import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.classic.Session; @@ -48,6 +50,8 @@ protected List<CollectionDescriptor> colDest = new ArrayList<CollectionDescriptor>(); protected Article article = new Article(); protected List<Article> articles = new ArrayList<Article>(); + protected ArticleCategory category = new ArticleCategory(); + protected User user = new User(); private String msg=""; private String id=""; @@ -430,6 +434,19 @@ public void setArticles(List<Article> articles) { this.articles = articles; } + public ArticleCategory getCategory() { + return category; + } + public void setCategory(ArticleCategory category) { + this.category = category; + } + public User getUser() { + return user; + } + public void setUser(User user) { + this.user = user; + } + } Modified: trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java 2008-09-01 04:50:32 UTC (rev 67) +++ trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java 2008-09-01 11:25:40 UTC (rev 68) @@ -10,11 +10,13 @@ import org.blueoxygen.aconix.entity.ACollection; import org.blueoxygen.aconix.entity.Article; +import org.blueoxygen.aconix.entity.ArticleCategory; import org.blueoxygen.aconix.entity.CollectionDescriptor; import org.blueoxygen.aconix.entity.CollectionSelectedDetail; import org.blueoxygen.aconix.entity.PageCollection; import org.blueoxygen.aconix.entity.PageCollectionDetail; import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactory; +import org.blueoxygen.cimande.security.User; import org.hibernate.HibernateException; /** @@ -29,6 +31,12 @@ private List ord = new ArrayList(); private List ord1 = new ArrayList(); private List ord2 = new ArrayList(); + private List ord3 = new ArrayList(); + private List ord4 = new ArrayList(); + private List ord5 = new ArrayList(); + private String nameDesc = ""; + private List artCat = new ArrayList(); + private List userAc = new ArrayList(); public String execute() { if (getPCol().getName() != null @@ -63,28 +71,80 @@ List r = new ArrayList(); List e = new ArrayList(); List i = new ArrayList(); + List w = new ArrayList(); + List y = new ArrayList(); + List o = new ArrayList(); while (con.next()) { + w.add(con.getString("id")); r.add(con.getString("name")); e.add(con.getString("description")); i.add(con.getString("create_date")); + y.add(con.getString("category_id")); + o.add(con.getString("create_by")); } + for(int x = 0; x < y.size() ; x++){ + String cat = (String) y.get(x); + category = (ArticleCategory) getManager().getById(ArticleCategory.class, cat); + artCat.add(category.getName()); + } + + for(int t = 0; t < o.size() ; t++){ + String us = (String) o.get(t); + user = (User) getManager().getById(User.class, us); + userAc.add(user.getUsername()); + } ord.add(r); ord1.add(e); ord2.add(i); + ord3.add(w); + ord4.add(artCat); + ord5.add(userAc); + } catch (HibernateException e) { e.printStackTrace(); } catch (SQLException e) { e.printStackTrace(); } + setNameDesc(m.getDescriptor().getName()); } - System.out.println("ordered :"+ord); } } } } return SUCCESS; } + + + + public List getUserAc() { + return userAc; + } + + + + + public void setUserAc(List userAc) { + this.userAc = userAc; + } + + + + + public List getArtCat() { + return artCat; + } + + + + + public void setArtCat(List artCat) { + this.artCat = artCat; + } + + + + /** * @return the hsf */ @@ -168,4 +228,47 @@ this.ord2 = ord2; } + public List getOrd3() { + return ord3; + } + + public void setOrd3(List ord3) { + this.ord3 = ord3; + } + + public String getNameDesc() { + return nameDesc; + } + + public void setNameDesc(String nameDesc) { + this.nameDesc = nameDesc; + } + + + public List getOrd4() { + return ord4; + } + + + public void setOrd4(List ord4) { + this.ord4 = ord4; + } + + + + + public List getOrd5() { + return ord5; + } + + + + + public void setOrd5(List ord5) { + this.ord5 = ord5; + } + + + + } Modified: trunk/src/template/view/frontpage/detail.vm =================================================================== --- trunk/src/template/view/frontpage/detail.vm 2008-09-01 04:50:32 UTC (rev 67) +++ trunk/src/template/view/frontpage/detail.vm 2008-09-01 11:25:40 UTC (rev 68) @@ -9,48 +9,87 @@ <div class="menu"> <table width="200" height="141" border="0" cellpadding="0" cellspacing="0"> <tr> -<td width="20" height="20"><img src="../images/aconix/menu-kiri-atas.gif" /></td> -<td width="163" background="../images/aconix/background.gif"> </td> -<td width="17" height="20"><img src="../images/aconix/menu-kanan-atas.gif" /></td> +<td width="20" height="20"> </td> +<td width="163"> </td> +<td width="17" height="20"> </td> </tr> <tr> -<td height="100" background="../images/aconix/background.gif"></td> -<td background="../images/aconix/background.gif" valign="top"><a href="../frontpage/create.action?pCol.name=index">Home</a><br /> +<td height="100"> </td> +<td valign="top"><a href="../frontpage/create.action?pCol.name=index">Home</a><br /><br /> #if($currentUser) -<a href="../backend/user/logout.action">Logout</a><br /> -<a href="../backend/user/index.action">Workspace</a><br /> +<a href="../backend/user/logout.action">Logout</a><br /><br /> +<a href="../backend/user/index.action">Workspace</a><br /><br /> #else -<a href="../backend/user/index.action">Login</a><br /> +<a href="../backend/user/index.action">Login</a><br /><br /> #end <a href="http://home.blueoxygen.org/web/guest/about" target="blank">About Us</a> -<td background="../images/aconix/background.gif"></td> +<td> </td> </tr> <tr> -<td width="20" height="20" valign="top"><img src="../images/aconix/menu-kiri-bawah.gif" /></td> -<td background="../images/aconix/background.gif" height="20"> </td> -<td width="17" height="20" valign="top"><img src="../images/aconix/menu-kanan-bawah.gif" /></td> +<td width="20" height="20" valign="top"> </td> +<td height="20"> </td> +<td width="17" height="20" valign="top"> </td> </tr> </table> </div> +<div class="selected"> +<table width="200" height="300" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td width="20" height="42"><img src="../images/aconix/kiri-atas.gif" /></td> +<td background="../images/aconix/selected-atas.gif" nowrap><strong><font color="#ffffff" size="3">Category</font></strong></td> +<td width="20" height="42"><img src="../images/aconix/kanan-atas.gif" /></td> +</tr> +<tr> +<td background="../images/aconix/selected-kiri.gif"></td> +<td valign="top"><table width="100%" border="0" bgcolor="#ffffff" cellspacing="1" cellpadding="5"> + #foreach($p in $PColDels) + #if($p.collection.collectionSelectedDetails.isEmpty() == false) + +## <th> +## $p.collection.name +## </th> + #foreach($d in $p.collection.collectionSelectedDetails) + + <tr bgcolor="#ffffff"> + <td> + <a href="../frontpage/view.action?id=$d.articleId&pCol.name=index">$d.articleName</a> + </td> + </tr> + #end + #end + #end + + </table> +</td> +<td background="../images/aconix/selected-kanan.gif"></td> +</tr> +<tr> +<td height="20"><img src="../images/aconix/selected-kiri-bawah.gif" /></td> +<td background="../images/aconix/selected-bawah.gif"> </td> +<td height="20"><img src="../images/aconix/selected-kanan-bawah.gif" /></td> +</tr> + +</table> +</div> <div class="ordered"> <table width="500" height="400" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="25" height="45"><img src="../images/aconix/ordered-kiri-atas.gif" /></td> -<td background="../images/aconix/ordered-atas.gif" nowrap><font color="#ffffff">News</font></td> +<td background="../images/aconix/ordered-atas.gif" nowrap><strong><font color="#ffffff" size="3">Articles</font></strong></td> <td width="25" height="45"><img src="../images/aconix/ordered-kanan-atas.gif" /></td> </tr> <tr> <td background="../images/aconix/ordered-kiri.gif"></td> -<td valign="top"><table width="100%" border="0" bgcolor="#d0dcff" cellspacing="1" cellpadding="5"> +<td valign="top"><table width="100%" border="0" bgcolor="#ffffff" cellspacing="1" cellpadding="5"> - <tr bgcolor="#cccccc"> - <td><font size="3">$title</font></td> + <tr bgcolor="#ffffff"> + <td><strong><font size="3">$title</font></strong></td> </tr> - <tr bgcolor="#cccccc"> + <tr bgcolor="#ffffff"> - <td>Posted : $tgl</td> + <td>Posted By : $us Category : $cat at : $tgl</td> </tr> <tr bgcolor="#ffffff"> <td>$description</td> Added: trunk/src/template/view/frontpage/detailCat.vm =================================================================== --- trunk/src/template/view/frontpage/detailCat.vm (rev 0) +++ trunk/src/template/view/frontpage/detailCat.vm 2008-09-01 11:25:40 UTC (rev 68) @@ -0,0 +1,114 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html> + <head> + <title>BlueOxygen Aconix</title> + <link type="text/css" rel="stylesheet" href="../style.css" > + </head> + <body> + <div class="image"><img src="../images/e-business-suite.gif" /></div> +<div class="menu"> +<table width="200" height="141" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td width="20" height="20"> </td> +<td width="163"> </td> +<td width="17" height="20"> </td> +</tr> +<tr> +<td height="100"> </td> +<td valign="top"><a href="../frontpage/create.action?pCol.name=index">Home</a><br /><br /> +#if($currentUser) +<a href="../backend/user/logout.action">Logout</a><br /><br /> +<a href="../backend/user/index.action">Workspace</a><br /><br /> +#else +<a href="../backend/user/index.action">Login</a><br /><br /> +#end +<a href="http://home.blueoxygen.org/web/guest/about" target="blank">About Us</a> + +<td> </td> +</tr> +<tr> +<td width="20" height="20" valign="top"> </td> +<td height="20"> </td> +<td width="17" height="20" valign="top"> </td> +</tr> + +</table> +</div> +<div class="selected"> +<table width="200" height="300" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td width="20" height="42"><img src="../images/aconix/kiri-atas.gif" /></td> +<td background="../images/aconix/selected-atas.gif" nowrap><strong><font color="#ffffff" size="3">Category</font></strong></td> +<td width="20" height="42"><img src="../images/aconix/kanan-atas.gif" /></td> +</tr> +<tr> +<td background="../images/aconix/selected-kiri.gif"></td> +<td valign="top"><table width="100%" border="0" bgcolor="#ffffff" cellspacing="1" cellpadding="5"> + #foreach($p in $PColDels) + #if($p.collection.collectionSelectedDetails.isEmpty() == false) + +## <th> +## $p.collection.name +## </th> + #foreach($d in $p.collection.collectionSelectedDetails) + + <tr bgcolor="#ffffff"> + <td> + <a href="../frontpage/view.action?id=$d.articleId&pCol.name=index">$d.articleName</a> + </td> + </tr> + #end + #end + #end + + </table> +</td> +<td background="../images/aconix/selected-kanan.gif"></td> +</tr> +<tr> +<td height="20"><img src="../images/aconix/selected-kiri-bawah.gif" /></td> +<td background="../images/aconix/selected-bawah.gif"> </td> +<td height="20"><img src="../images/aconix/selected-kanan-bawah.gif" /></td> +</tr> + +</table> +</div> +<div class="ordered"> +<table width="500" height="400" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td width="25" height="45"><img src="../images/aconix/ordered-kiri-atas.gif" /></td> +<td background="../images/aconix/ordered-atas.gif" nowrap><strong><font color="#ffffff" size="3">Articles on $cat</font></strong></td> +<td width="25" height="45"><img src="../images/aconix/ordered-kanan-atas.gif" /></td> +</tr> +<tr> +<td background="../images/aconix/ordered-kiri.gif"></td> +<td valign="top"><table width="100%" border="0" bgcolor="#ffffff" cellspacing="1" cellpadding="5"> + #foreach($viewCat in $articles) + <tr bgcolor="#ffffff"> + <td><strong><font size="3">$viewCat.name</font></strong></td> + </tr> + <tr bgcolor="#ffffff"> + + <td>Posted By : $us Category : $viewCat.categoryId.name at : $viewCat.logInformation.createDate</td> + </tr> + <tr bgcolor="#ffffff"> + <td>$viewCat.description</td> + </tr> + #end + </table> +</td> +<td background="../images/aconix/ordered-kanan.gif"></td> +</tr> +<tr> +<td width="25" height="25"><img src="../images/aconix/ordered-kiri-bawah.gif" /></td> +<td background="../images/aconix/ordered-bawah.gif"> </td> +<td width="25" height="25"><img src="../images/aconix/ordered-kanan-bawah.gif" /></td> +</tr> + +</table> +</div> + + </body> +</html> + + Modified: trunk/src/template/view/frontpage/index.vm =================================================================== --- trunk/src/template/view/frontpage/index.vm 2008-09-01 04:50:32 UTC (rev 67) +++ trunk/src/template/view/frontpage/index.vm 2008-09-01 11:25:40 UTC (rev 68) @@ -9,27 +9,27 @@ <div class="menu"> <table width="200" height="141" border="0" cellpadding="0" cellspacing="0"> <tr> -<td width="20" height="20"><img src="../images/aconix/menu-kiri-atas.gif" /></td> -<td width="163" background="../images/aconix/background.gif"> </td> -<td width="17" height="20"><img src="../images/aconix/menu-kanan-atas.gif" /></td> +<td width="20" height="20"> </td> +<td width="163"> </td> +<td width="17" height="20"> </td> </tr> <tr> -<td height="100" background="../images/aconix/background.gif"></td> -<td background="../images/aconix/background.gif" valign="top"><a href="../frontpage/create.action?pCol.name=index">Home</a><br /> +<td height="100"> </td> +<td valign="top"><a href="../frontpage/create.action?pCol.name=index">Home</a><br /><br /> #if($currentUser) -<a href="../backend/user/logout.action">Logout</a><br /> -<a href="../backend/user/index.action">Workspace</a><br /> +<a href="../backend/user/logout.action">Logout</a><br /><br /> +<a href="../backend/user/index.action">Workspace</a><br /><br /> #else -<a href="../backend/user/index.action">Login</a><br /> +<a href="../backend/user/index.action">Login</a><br /><br /> #end <a href="http://home.blueoxygen.org/web/guest/about" target="blank">About Us</a> -<td background="../images/aconix/background.gif"></td> +<td> </td> </tr> <tr> -<td width="20" height="20" valign="top"><img src="../images/aconix/menu-kiri-bawah.gif" /></td> -<td background="../images/aconix/background.gif" height="20"> </td> -<td width="17" height="20" valign="top"><img src="../images/aconix/menu-kanan-bawah.gif" /></td> +<td width="20" height="20" valign="top"> </td> +<td height="20"> </td> +<td width="17" height="20" valign="top"> </td> </tr> </table> @@ -43,7 +43,7 @@ </tr> <tr> <td background="../images/aconix/selected-kiri.gif"></td> -<td valign="top"><table width="100%" border="0" bgcolor="#d0dcff" cellspacing="1" cellpadding="5"> +<td valign="top"><table width="100%" border="0" bgcolor="#ffffff" cellspacing="1" cellpadding="5"> #foreach($p in $PColDels) #if($p.collection.collectionSelectedDetails.isEmpty() == false) @@ -54,7 +54,7 @@ <tr bgcolor="#ffffff"> <td> - <a href="../frontpage/view.action?id=$d.articleId&name=$d.descriptor.name">$d.articleName</a> + <a href="../frontpage/view.action?id=$d.articleId&pCol.name=index">$d.articleName</a> </td> </tr> #end @@ -77,12 +77,12 @@ <table width="500" height="400" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="25" height="45"><img src="../images/aconix/ordered-kiri-atas.gif" /></td> -<td background="../images/aconix/ordered-atas.gif" nowrap><strong><font color="#ffffff" size="3">News</font></strong></td> +<td background="../images/aconix/ordered-atas.gif" nowrap><strong><font color="#ffffff" size="3">Articles</font></strong></td> <td width="25" height="45"><img src="../images/aconix/ordered-kanan-atas.gif" /></td> </tr> <tr> <td background="../images/aconix/ordered-kiri.gif"></td> -<td valign="top"><table width="100%" border="0" bgcolor="#d0dcff" cellspacing="1" cellpadding="5"> +<td valign="top"><table width="100%" border="0" bgcolor="#ffffff" cellspacing="1" cellpadding="5"> #set($r = 0) #foreach($y in $PColDels) #if($y.collection.collectionDescriptors.isEmpty() == false) @@ -96,10 +96,10 @@ </tr> <tr bgcolor="#ffffff"> #set($no = $velocityCount - 1) - <td>Posted : $ord2.get($r).get($no)</td> + <td>Posted By: $ord5.get($r).get($no) Category : $ord4.get($r).get($no) at : $ord2.get($r).get($no)</td> </tr> <tr bgcolor="#ffffff"> - <td>$ord1.get($r).get($no)</td> + <td>$ord1.get($r).get($no) <a href="../frontpage/detail.action?id=$ord3.get($r).get($no)&name=$nameDesc&pCol.name=index">more...</a></td> </tr> #end #set($r = $r + 1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kas...@us...> - 2008-09-01 04:50:26
|
Revision: 67 http://aconix.svn.sourceforge.net/aconix/?rev=67&view=rev Author: kaskuers Date: 2008-09-01 04:50:32 +0000 (Mon, 01 Sep 2008) Log Message: ----------- revision 1 : change index page Revision Links: -------------- http://aconix.svn.sourceforge.net/aconix/?rev=1&view=rev Modified Paths: -------------- trunk/src/template/view/frontpage/index.vm Added Paths: ----------- trunk/src/images/Thumbs.db Property changes on: trunk/src/images/Thumbs.db ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/src/template/view/frontpage/index.vm =================================================================== --- trunk/src/template/view/frontpage/index.vm 2008-08-31 08:01:44 UTC (rev 66) +++ trunk/src/template/view/frontpage/index.vm 2008-09-01 04:50:32 UTC (rev 67) @@ -38,7 +38,7 @@ <table width="200" height="300" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="20" height="42"><img src="../images/aconix/kiri-atas.gif" /></td> -<td background="../images/aconix/selected-atas.gif" nowrap><font color="#ffffff">Article</font></td> +<td background="../images/aconix/selected-atas.gif" nowrap><strong><font color="#ffffff" size="3">Category</font></strong></td> <td width="20" height="42"><img src="../images/aconix/kanan-atas.gif" /></td> </tr> <tr> @@ -77,7 +77,7 @@ <table width="500" height="400" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="25" height="45"><img src="../images/aconix/ordered-kiri-atas.gif" /></td> -<td background="../images/aconix/ordered-atas.gif" nowrap><font color="#ffffff">News</font></td> +<td background="../images/aconix/ordered-atas.gif" nowrap><strong><font color="#ffffff" size="3">News</font></strong></td> <td width="25" height="45"><img src="../images/aconix/ordered-kanan-atas.gif" /></td> </tr> <tr> @@ -91,10 +91,10 @@ ## </th> #foreach($e in $ord.get($r)) - <tr bgcolor="#cccccc"> - <td><font size="3">$e</font></td> + <tr bgcolor="#ffffff"> + <td><strong><font size="3">$e</font></strong></td> </tr> - <tr bgcolor="#cccccc"> + <tr bgcolor="#ffffff"> #set($no = $velocityCount - 1) <td>Posted : $ord2.get($r).get($no)</td> </tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kas...@us...> - 2008-08-31 08:01:36
|
Revision: 66 http://aconix.svn.sourceforge.net/aconix/?rev=66&view=rev Author: kaskuers Date: 2008-08-31 08:01:44 +0000 (Sun, 31 Aug 2008) Log Message: ----------- edited detail page Modified Paths: -------------- trunk/src/template/view/frontpage/detail.vm trunk/src/template/view/frontpage/index.vm Modified: trunk/src/template/view/frontpage/detail.vm =================================================================== --- trunk/src/template/view/frontpage/detail.vm 2008-08-31 07:11:10 UTC (rev 65) +++ trunk/src/template/view/frontpage/detail.vm 2008-08-31 08:01:44 UTC (rev 66) @@ -5,48 +5,70 @@ <link type="text/css" rel="stylesheet" href="../style.css" > </head> <body> - <center> - <br> - <br> - <table width="80%" border="0" bgcolor="#0000ff" cellspacing="1" cellpadding="2"> - <tr bgcolor="#28598e"> - <td colspan="2" align="left"><img src="../images/blueoxygen-logo.png"></td> - </tr> - <tr bgcolor="#ffffff"> - <td align="left" width="30%" valign="top"> - <table width="100%" border="0" bgcolor="#ffffff" cellspacing="1" cellpadding="5"> - <tr> - <td><a href="../frontpage/create.action?pCol.name=index">Home</a></td> + <div class="image"><img src="../images/e-business-suite.gif" /></div> +<div class="menu"> +<table width="200" height="141" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td width="20" height="20"><img src="../images/aconix/menu-kiri-atas.gif" /></td> +<td width="163" background="../images/aconix/background.gif"> </td> +<td width="17" height="20"><img src="../images/aconix/menu-kanan-atas.gif" /></td> +</tr> +<tr> +<td height="100" background="../images/aconix/background.gif"></td> +<td background="../images/aconix/background.gif" valign="top"><a href="../frontpage/create.action?pCol.name=index">Home</a><br /> +#if($currentUser) +<a href="../backend/user/logout.action">Logout</a><br /> +<a href="../backend/user/index.action">Workspace</a><br /> +#else +<a href="../backend/user/index.action">Login</a><br /> +#end +<a href="http://home.blueoxygen.org/web/guest/about" target="blank">About Us</a> + +<td background="../images/aconix/background.gif"></td> +</tr> +<tr> +<td width="20" height="20" valign="top"><img src="../images/aconix/menu-kiri-bawah.gif" /></td> +<td background="../images/aconix/background.gif" height="20"> </td> +<td width="17" height="20" valign="top"><img src="../images/aconix/menu-kanan-bawah.gif" /></td> +</tr> + +</table> +</div> +<div class="ordered"> +<table width="500" height="400" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td width="25" height="45"><img src="../images/aconix/ordered-kiri-atas.gif" /></td> +<td background="../images/aconix/ordered-atas.gif" nowrap><font color="#ffffff">News</font></td> +<td width="25" height="45"><img src="../images/aconix/ordered-kanan-atas.gif" /></td> +</tr> +<tr> +<td background="../images/aconix/ordered-kiri.gif"></td> +<td valign="top"><table width="100%" border="0" bgcolor="#d0dcff" cellspacing="1" cellpadding="5"> + + <tr bgcolor="#cccccc"> + <td><font size="3">$title</font></td> </tr> - <tr> - <td><a href="../backend/user/index.action">Login</a></td> - </tr> - <tr> - <td><a href="http://home.blueoxygen.org/web/guest/about" target="blank">About Us</a></td> - </tr> - </table> - </td> - <td align="left" width="70%" valign="top"> - <table width="100%" border="0" bgcolor="#d0dcff" cellspacing="1" cellpadding="5"> - <th> - News - </th> <tr bgcolor="#cccccc"> - <td><font size="3">$!title</font></td> + + <td>Posted : $tgl</td> </tr> <tr bgcolor="#ffffff"> - <td>Posted : $!tgl</td> + <td>$description</td> </tr> - <tr bgcolor="#ffffff"> - <td>$!description</td> - </tr> </table> - </td> - </tr> - </table> - © 2000 - 2008 , Blueoxygen Technology - </center> -</body> +</td> +<td background="../images/aconix/ordered-kanan.gif"></td> +</tr> +<tr> +<td width="25" height="25"><img src="../images/aconix/ordered-kiri-bawah.gif" /></td> +<td background="../images/aconix/ordered-bawah.gif"> </td> +<td width="25" height="25"><img src="../images/aconix/ordered-kanan-bawah.gif" /></td> +</tr> + +</table> +</div> + + </body> </html> Modified: trunk/src/template/view/frontpage/index.vm =================================================================== --- trunk/src/template/view/frontpage/index.vm 2008-08-31 07:11:10 UTC (rev 65) +++ trunk/src/template/view/frontpage/index.vm 2008-08-31 08:01:44 UTC (rev 66) @@ -38,18 +38,18 @@ <table width="200" height="300" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="20" height="42"><img src="../images/aconix/kiri-atas.gif" /></td> -<td background="../images/aconix/selected-atas.gif" width="160" nowrap> </td> +<td background="../images/aconix/selected-atas.gif" nowrap><font color="#ffffff">Article</font></td> <td width="20" height="42"><img src="../images/aconix/kanan-atas.gif" /></td> </tr> <tr> <td background="../images/aconix/selected-kiri.gif"></td> -<td><table width="100%" border="0" bgcolor="#d0dcff" cellspacing="1" cellpadding="5"> +<td valign="top"><table width="100%" border="0" bgcolor="#d0dcff" cellspacing="1" cellpadding="5"> #foreach($p in $PColDels) #if($p.collection.collectionSelectedDetails.isEmpty() == false) - <th> - $p.collection.name - </th> +## <th> +## $p.collection.name +## </th> #foreach($d in $p.collection.collectionSelectedDetails) <tr bgcolor="#ffffff"> @@ -77,18 +77,18 @@ <table width="500" height="400" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="25" height="45"><img src="../images/aconix/ordered-kiri-atas.gif" /></td> -<td background="../images/aconix/ordered-atas.gif"> </td> +<td background="../images/aconix/ordered-atas.gif" nowrap><font color="#ffffff">News</font></td> <td width="25" height="45"><img src="../images/aconix/ordered-kanan-atas.gif" /></td> </tr> <tr> <td background="../images/aconix/ordered-kiri.gif"></td> -<td><table width="100%" border="0" bgcolor="#d0dcff" cellspacing="1" cellpadding="5"> +<td valign="top"><table width="100%" border="0" bgcolor="#d0dcff" cellspacing="1" cellpadding="5"> #set($r = 0) #foreach($y in $PColDels) #if($y.collection.collectionDescriptors.isEmpty() == false) - <th> - $y.collection.name - </th> +## <th> +## $y.collection.name +## </th> #foreach($e in $ord.get($r)) <tr bgcolor="#cccccc"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kas...@us...> - 2008-08-31 07:11:01
|
Revision: 65 http://aconix.svn.sourceforge.net/aconix/?rev=65&view=rev Author: kaskuers Date: 2008-08-31 07:11:10 +0000 (Sun, 31 Aug 2008) Log Message: ----------- new frontpage Modified Paths: -------------- trunk/src/template/view/frontpage/index.vm Added Paths: ----------- trunk/src/images/ trunk/src/images/background.gif trunk/src/images/kanan-atas.gif trunk/src/images/kiri-atas.gif trunk/src/images/menu-kanan-atas.gif trunk/src/images/menu-kanan-bawah.gif trunk/src/images/menu-kiri-atas.gif trunk/src/images/menu-kiri-bawah.gif trunk/src/images/ordered-atas.gif trunk/src/images/ordered-bawah.gif trunk/src/images/ordered-kanan-atas.gif trunk/src/images/ordered-kanan-bawah.gif trunk/src/images/ordered-kanan.gif trunk/src/images/ordered-kiri-atas.gif trunk/src/images/ordered-kiri-bawah.gif trunk/src/images/ordered-kiri.gif trunk/src/images/selected-atas.gif trunk/src/images/selected-bawah.gif trunk/src/images/selected-kanan-bawah.gif trunk/src/images/selected-kanan.gif trunk/src/images/selected-kiri-bawah.gif trunk/src/images/selected-kiri.gif Property changes on: trunk/src/images/background.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/kanan-atas.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/kiri-atas.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/menu-kanan-atas.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/menu-kanan-bawah.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/menu-kiri-atas.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/menu-kiri-bawah.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/ordered-atas.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/ordered-bawah.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/ordered-kanan-atas.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/ordered-kanan-bawah.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/ordered-kanan.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/ordered-kiri-atas.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/ordered-kiri-bawah.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/ordered-kiri.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/selected-atas.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/selected-bawah.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/selected-kanan-bawah.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/selected-kanan.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/selected-kiri-bawah.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/src/images/selected-kiri.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/src/template/view/frontpage/index.vm =================================================================== --- trunk/src/template/view/frontpage/index.vm 2008-08-19 17:31:46 UTC (rev 64) +++ trunk/src/template/view/frontpage/index.vm 2008-08-31 07:11:10 UTC (rev 65) @@ -5,38 +5,45 @@ <link type="text/css" rel="stylesheet" href="../style.css" > </head> <body> - <center> - <br> - <br> - <table width="80%" border="0" bgcolor="#0000ff" cellspacing="1" cellpadding="2"> - <tr bgcolor="#28598e"> - <td colspan="2" align="left"><img src="../images/blueoxygen-logo.png"></td> - </tr> - <tr bgcolor="#ffffff"> - <td align="left" width="30%" valign="top"> - <table width="100%" border="0" bgcolor="#ffffff" cellspacing="1" cellpadding="5"> - <tr> - <td><a href="../frontpage/create.action?pCol.name=index">Home</a></td> - </tr> - <tr> - #if($currentUser) - <td><a href="../backend/user/logout.action">Logout</a></td> - - #else - <td><a href="../backend/user/index.action">Login</a></td> - #end - </tr> - #if($currentUser) - <tr> - <td><a href="../backend/user/index.action">Workspace</a></td> - </tr - #end - <tr> - <td><a href="http://home.blueoxygen.org/web/guest/about" target="blank">About Us</a></td> - </tr> - <tr> - <td> - <table width="100%" border="0" bgcolor="#d0dcff" cellspacing="1" cellpadding="5"> + <div class="image"><img src="../images/e-business-suite.gif" /></div> +<div class="menu"> +<table width="200" height="141" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td width="20" height="20"><img src="../images/aconix/menu-kiri-atas.gif" /></td> +<td width="163" background="../images/aconix/background.gif"> </td> +<td width="17" height="20"><img src="../images/aconix/menu-kanan-atas.gif" /></td> +</tr> +<tr> +<td height="100" background="../images/aconix/background.gif"></td> +<td background="../images/aconix/background.gif" valign="top"><a href="../frontpage/create.action?pCol.name=index">Home</a><br /> +#if($currentUser) +<a href="../backend/user/logout.action">Logout</a><br /> +<a href="../backend/user/index.action">Workspace</a><br /> +#else +<a href="../backend/user/index.action">Login</a><br /> +#end +<a href="http://home.blueoxygen.org/web/guest/about" target="blank">About Us</a> + +<td background="../images/aconix/background.gif"></td> +</tr> +<tr> +<td width="20" height="20" valign="top"><img src="../images/aconix/menu-kiri-bawah.gif" /></td> +<td background="../images/aconix/background.gif" height="20"> </td> +<td width="17" height="20" valign="top"><img src="../images/aconix/menu-kanan-bawah.gif" /></td> +</tr> + +</table> +</div> +<div class="selected"> +<table width="200" height="300" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td width="20" height="42"><img src="../images/aconix/kiri-atas.gif" /></td> +<td background="../images/aconix/selected-atas.gif" width="160" nowrap> </td> +<td width="20" height="42"><img src="../images/aconix/kanan-atas.gif" /></td> +</tr> +<tr> +<td background="../images/aconix/selected-kiri.gif"></td> +<td><table width="100%" border="0" bgcolor="#d0dcff" cellspacing="1" cellpadding="5"> #foreach($p in $PColDels) #if($p.collection.collectionSelectedDetails.isEmpty() == false) @@ -55,12 +62,27 @@ #end </table> - </td> - </tr> - </table> - </td> - <td align="left" width="70%" valign="top"> - <table width="100%" border="0" bgcolor="#d0dcff" cellspacing="1" cellpadding="5"> +</td> +<td background="../images/aconix/selected-kanan.gif"></td> +</tr> +<tr> +<td height="20"><img src="../images/aconix/selected-kiri-bawah.gif" /></td> +<td background="../images/aconix/selected-bawah.gif"> </td> +<td height="20"><img src="../images/aconix/selected-kanan-bawah.gif" /></td> +</tr> + +</table> +</div> +<div class="ordered"> +<table width="500" height="400" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td width="25" height="45"><img src="../images/aconix/ordered-kiri-atas.gif" /></td> +<td background="../images/aconix/ordered-atas.gif"> </td> +<td width="25" height="45"><img src="../images/aconix/ordered-kanan-atas.gif" /></td> +</tr> +<tr> +<td background="../images/aconix/ordered-kiri.gif"></td> +<td><table width="100%" border="0" bgcolor="#d0dcff" cellspacing="1" cellpadding="5"> #set($r = 0) #foreach($y in $PColDels) #if($y.collection.collectionDescriptors.isEmpty() == false) @@ -85,12 +107,19 @@ #end </table> - </td> - </tr> - </table> - © 2000 - 2008 , Blueoxygen Technology - </center> -</body> +</td> +<td background="../images/aconix/ordered-kanan.gif"></td> +</tr> +<tr> +<td width="25" height="25"><img src="../images/aconix/ordered-kiri-bawah.gif" /></td> +<td background="../images/aconix/ordered-bawah.gif"> </td> +<td width="25" height="25"><img src="../images/aconix/ordered-kanan-bawah.gif" /></td> +</tr> + +</table> +</div> + + </body> </html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kas...@us...> - 2008-08-19 17:31:38
|
Revision: 64 http://aconix.svn.sourceforge.net/aconix/?rev=64&view=rev Author: kaskuers Date: 2008-08-19 17:31:46 +0000 (Tue, 19 Aug 2008) Log Message: ----------- Upgrade at selected Collection Modified Paths: -------------- trunk/src/config/struts-aconix.xml trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java trunk/src/template/view/frontpage/detail.vm trunk/src/template/view/frontpage/index.vm trunk/src/template/view/module/aconix/article/ArticleForm.vm trunk/src/template/view/module/aconix/pageCollection/preview.vm Added Paths: ----------- trunk/src/java/org/blueoxygen/aconix/frontpage/ trunk/src/java/org/blueoxygen/aconix/frontpage/action/ trunk/src/java/org/blueoxygen/aconix/frontpage/action/ViewDetail.java Modified: trunk/src/config/struts-aconix.xml =================================================================== --- trunk/src/config/struts-aconix.xml 2008-08-16 08:20:35 UTC (rev 63) +++ trunk/src/config/struts-aconix.xml 2008-08-19 17:31:46 UTC (rev 64) @@ -179,7 +179,7 @@ <action name="create" class="org.blueoxygen.aconix.pageCollection.action.Preview"> <result name="success" type="velocity">/view/frontpage/index.vm</result> </action> - <action name="view" class="org.blueoxygen.aconix.article.action.ArticleForm" method="editArticle"> + <action name="view" class="org.blueoxygen.aconix.frontpage.action.ViewDetail"> <result name="success" type="velocity">/view/frontpage/detail.vm</result> </action> </package> Added: trunk/src/java/org/blueoxygen/aconix/frontpage/action/ViewDetail.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/frontpage/action/ViewDetail.java (rev 0) +++ trunk/src/java/org/blueoxygen/aconix/frontpage/action/ViewDetail.java 2008-08-19 17:31:46 UTC (rev 64) @@ -0,0 +1,101 @@ +/** + * + */ +package org.blueoxygen.aconix.frontpage.action; + +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; + +import org.blueoxygen.cimande.CimandeAction; +import org.blueoxygen.cimande.persistence.PersistenceAware; +import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactory; +import org.hibernate.HibernateException; + +/** + * @author heaven + * + */ +public class ViewDetail extends CimandeAction implements PersistenceAware { + private String name = ""; + private String id = ""; + private HibernateSessionFactory hsf; + private String title =""; + private String description=""; + private String tgl = ""; + + public String execute() { + //if (!getId().equalsIgnoreCase("") && getId() != null) { + System.out.println(getId()+" = "+getName()); + try { + ResultSet con = hsf.createSession().connection() + .createStatement().executeQuery("SELECT * FROM " + getName() + " WHERE id='"+ getId() + "'"); + + while(con.next()){ + title = con.getString("name"); + description = con.getString("description"); + tgl = con.getString("create_date"); + } + } catch (HibernateException e) { + e.printStackTrace(); + } catch (SQLException e) { + e.printStackTrace(); + } + + //} + return SUCCESS; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getTgl() { + return tgl; + } + + public void setTgl(String tgl) { + this.tgl = tgl; + } + + public HibernateSessionFactory getHsf() { + return hsf; + } + + public void setHsf(HibernateSessionFactory hsf) { + this.hsf = hsf; + } + + + + +} Modified: trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java 2008-08-16 08:20:35 UTC (rev 63) +++ trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java 2008-08-19 17:31:46 UTC (rev 64) @@ -40,20 +40,15 @@ if (!getPColDels().isEmpty()) { for (PageCollectionDetail s : getPColDels()) { ACollection coll = s.getCollection(); - if (!coll.getCollectionSelectedDetails() - .isEmpty()) { + if (!coll.getCollectionSelectedDetails().isEmpty()) { for (CollectionSelectedDetail e : coll .getCollectionSelectedDetails()) { - setArticle((Article) getManager().getById( - Article.class, e.getArticleId())); - descId = getArticle().getDescription(); - sel.add(descId); + + } - } else if (!coll.getCollectionDescriptors() - .isEmpty()) { + } else if (!coll.getCollectionDescriptors().isEmpty()) { for (CollectionDescriptor m : coll .getCollectionDescriptors()) { - LOG.info(coll); try { ResultSet con = hsf.createSession() .connection().createStatement() @@ -82,7 +77,7 @@ e.printStackTrace(); } } - LOG.info(ord.toString()); + System.out.println("ordered :"+ord); } } } Modified: trunk/src/template/view/frontpage/detail.vm =================================================================== --- trunk/src/template/view/frontpage/detail.vm 2008-08-16 08:20:35 UTC (rev 63) +++ trunk/src/template/view/frontpage/detail.vm 2008-08-19 17:31:46 UTC (rev 64) @@ -32,13 +32,13 @@ News </th> <tr bgcolor="#cccccc"> - <td><font size="3">$!article.name</font></td> + <td><font size="3">$!title</font></td> </tr> <tr bgcolor="#ffffff"> - <td>Posted : $!article.logInformation.createDate , Category : $!article.categoryId.name</td> + <td>Posted : $!tgl</td> </tr> <tr bgcolor="#ffffff"> - <td>$!article.description</td> + <td>$!description</td> </tr> </table> </td> Modified: trunk/src/template/view/frontpage/index.vm =================================================================== --- trunk/src/template/view/frontpage/index.vm 2008-08-16 08:20:35 UTC (rev 63) +++ trunk/src/template/view/frontpage/index.vm 2008-08-19 17:31:46 UTC (rev 64) @@ -47,7 +47,7 @@ <tr bgcolor="#ffffff"> <td> - <a href="../frontpage/view.action?article.id=$d.articleId">$d.articleName</a> + <a href="../frontpage/view.action?id=$d.articleId&name=$d.descriptor.name">$d.articleName</a> </td> </tr> #end Modified: trunk/src/template/view/module/aconix/article/ArticleForm.vm =================================================================== --- trunk/src/template/view/module/aconix/article/ArticleForm.vm 2008-08-16 08:20:35 UTC (rev 63) +++ trunk/src/template/view/module/aconix/article/ArticleForm.vm 2008-08-19 17:31:46 UTC (rev 64) @@ -10,8 +10,8 @@ <script type="text/javascript" src="../../jscript/htmlarea/htmlarea.js"></script> </head> - ##<body onload="HTMLArea.replaceAll();"> - <body> + <body onload="HTMLArea.replaceAll();"> + #if(!$actionErrors.isEmpty()) <div class="errorMessage">Error</div> <ul class="errorMessage"> Modified: trunk/src/template/view/module/aconix/pageCollection/preview.vm =================================================================== --- trunk/src/template/view/module/aconix/pageCollection/preview.vm 2008-08-16 08:20:35 UTC (rev 63) +++ trunk/src/template/view/module/aconix/pageCollection/preview.vm 2008-08-19 17:31:46 UTC (rev 64) @@ -27,20 +27,23 @@ <tr> <td> <table width="100%" border="0" bgcolor="#d0dcff" cellspacing="1" cellpadding="5"> + ##set($l = 0) #foreach($p in $PColDels) #if($p.collection.collectionSelectedDetails.isEmpty() == false) <th> $p.collection.name </th> + #foreach($d in $p.collection.collectionSelectedDetails) <tr bgcolor="#ffffff"> <td> - <a href="../frontpage/view.action?article.id=$d.articleId">$d.articleName</a> + <a href="../frontpage/view.action?article.id=$d.articleId&name=$d.descriptor.name">$d.articleName</a> </td> </tr> - #end + #end + #end #end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kas...@us...> - 2008-08-16 08:20:27
|
Revision: 63 http://aconix.svn.sourceforge.net/aconix/?rev=63&view=rev Author: kaskuers Date: 2008-08-16 08:20:35 +0000 (Sat, 16 Aug 2008) Log Message: ----------- index page edited Modified Paths: -------------- trunk/src/template/view/frontpage/index.vm Modified: trunk/src/template/view/frontpage/index.vm =================================================================== --- trunk/src/template/view/frontpage/index.vm 2008-08-15 03:32:45 UTC (rev 62) +++ trunk/src/template/view/frontpage/index.vm 2008-08-16 08:20:35 UTC (rev 63) @@ -28,7 +28,7 @@ </tr> #if($currentUser) <tr> - <td><a href="../backend/yuitree.action">Workspace</a></td> + <td><a href="../backend/user/index.action">Workspace</a></td> </tr #end <tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kas...@us...> - 2008-08-15 03:32:41
|
Revision: 62 http://aconix.svn.sourceforge.net/aconix/?rev=62&view=rev Author: kaskuers Date: 2008-08-15 03:32:45 +0000 (Fri, 15 Aug 2008) Log Message: ----------- mengubah actionSupport menjadi CimandeAction karena menggunakan cimande 1.3 Modified Paths: -------------- trunk/src/java/org/blueoxygen/aconix/article/action/ArticleForm.java trunk/src/java/org/blueoxygen/aconix/article/action/listArticle.java trunk/src/java/org/blueoxygen/aconix/articleCategory/action/ArticleCategoryForm.java trunk/src/java/org/blueoxygen/aconix/collection/action/CollectionForm.java trunk/src/java/org/blueoxygen/aconix/collection/action/ListCollection.java trunk/src/java/org/blueoxygen/aconix/collection/action/ListOrdered.java trunk/src/java/org/blueoxygen/aconix/pageCollection/action/PageCollectionForm.java trunk/src/template/view/frontpage/detail.vm trunk/src/template/view/frontpage/index.vm trunk/src/template/view/module/aconix/article/ArticleForm.vm trunk/src/template/view/module/aconix/article/edit.vm trunk/src/template/view/module/aconix/article/listArticle.vm trunk/src/template/view/module/aconix/article/result.vm trunk/src/template/view/module/aconix/article/search.vm trunk/src/template/view/module/aconix/article/success.vm trunk/src/template/view/module/aconix/collection/CollectionForm.vm trunk/src/template/view/module/aconix/collection/OrderedCollection.vm trunk/src/template/view/module/aconix/collection/SelectedCollection.vm trunk/src/template/view/module/aconix/collection/confirmDelete.vm trunk/src/template/view/module/aconix/collection/edit.vm trunk/src/template/view/module/aconix/collection/editOrdered.vm trunk/src/template/view/module/aconix/collection/editSelected.vm trunk/src/template/view/module/aconix/collection/listCollection.vm trunk/src/template/view/module/aconix/collection/listOrdered.vm trunk/src/template/view/module/aconix/collection/result.vm trunk/src/template/view/module/aconix/collection/search.vm trunk/src/template/view/module/aconix/collection/success.vm trunk/src/template/view/module/aconix/pageCollection/AddPageCollection.vm trunk/src/template/view/module/aconix/pageCollection/PageCollectionForm.vm trunk/src/template/view/module/aconix/pageCollection/preview.vm trunk/src/template/view/module/aconix/pageCollection/result.vm trunk/src/template/view/module/aconix/pageCollection/search.vm trunk/src/template/view/module/aconix/pageCollection/success.vm Modified: trunk/src/java/org/blueoxygen/aconix/article/action/ArticleForm.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/article/action/ArticleForm.java 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/java/org/blueoxygen/aconix/article/action/ArticleForm.java 2008-08-15 03:32:45 UTC (rev 62) @@ -8,6 +8,7 @@ import org.blueoxygen.aconix.entity.Article; import org.blueoxygen.aconix.entity.ArticleCategory; +import org.blueoxygen.cimande.CimandeAction; import org.blueoxygen.cimande.persistence.PersistenceAware; import org.blueoxygen.cimande.persistence.PersistenceManager; @@ -17,7 +18,7 @@ * @author SiLeNT~SkY * */ -public class ArticleForm extends ActionSupport implements PersistenceAware { +public class ArticleForm extends CimandeAction implements PersistenceAware { private PersistenceManager manager; private Article article = new Article(); private List<Article> articles = new ArrayList<Article>(); Modified: trunk/src/java/org/blueoxygen/aconix/article/action/listArticle.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/article/action/listArticle.java 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/java/org/blueoxygen/aconix/article/action/listArticle.java 2008-08-15 03:32:45 UTC (rev 62) @@ -10,6 +10,7 @@ import java.util.List; import org.blueoxygen.aconix.entity.Article; +import org.blueoxygen.cimande.CimandeAction; import org.blueoxygen.cimande.descriptors.Descriptor; import org.blueoxygen.cimande.persistence.PersistenceAware; import org.blueoxygen.cimande.persistence.PersistenceManager; @@ -22,7 +23,7 @@ * @author SiLeNT~SkY * */ -public class listArticle extends ActionSupport implements PersistenceAware { +public class listArticle extends CimandeAction implements PersistenceAware { private HibernateSessionFactory hsf; private PersistenceManager manager; protected Descriptor descriptor = new Descriptor(); Modified: trunk/src/java/org/blueoxygen/aconix/articleCategory/action/ArticleCategoryForm.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/articleCategory/action/ArticleCategoryForm.java 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/java/org/blueoxygen/aconix/articleCategory/action/ArticleCategoryForm.java 2008-08-15 03:32:45 UTC (rev 62) @@ -7,6 +7,7 @@ import java.util.List; import org.blueoxygen.aconix.entity.ArticleCategory; +import org.blueoxygen.cimande.CimandeAction; import org.blueoxygen.cimande.persistence.PersistenceAware; import org.blueoxygen.cimande.persistence.PersistenceManager; @@ -16,7 +17,7 @@ * @author heaven * */ -public class ArticleCategoryForm extends ActionSupport implements PersistenceAware { +public class ArticleCategoryForm extends CimandeAction implements PersistenceAware { private PersistenceManager manager; private ArticleCategory ACategory = new ArticleCategory(); private List<ArticleCategory> ACategories = new ArrayList<ArticleCategory>(); Modified: trunk/src/java/org/blueoxygen/aconix/collection/action/CollectionForm.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/collection/action/CollectionForm.java 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/java/org/blueoxygen/aconix/collection/action/CollectionForm.java 2008-08-15 03:32:45 UTC (rev 62) @@ -14,6 +14,7 @@ import org.blueoxygen.aconix.entity.ACollection; import org.blueoxygen.aconix.entity.CollectionDescriptor; import org.blueoxygen.aconix.entity.CollectionSelectedDetail; +import org.blueoxygen.cimande.CimandeAction; import org.blueoxygen.cimande.DefaultPersistence; import org.blueoxygen.cimande.LogInformation; import org.blueoxygen.cimande.persistence.PersistenceAware; @@ -28,7 +29,7 @@ * @author SiLeNT~SkY * */ -public class CollectionForm extends ActionSupport implements PersistenceAware,SessionCredentialsAware { +public class CollectionForm extends CimandeAction implements PersistenceAware,SessionCredentialsAware { private SessionCredentials sess; private PersistenceManager manager; protected ACollection collection = new ACollection(); Modified: trunk/src/java/org/blueoxygen/aconix/collection/action/ListCollection.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/collection/action/ListCollection.java 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/java/org/blueoxygen/aconix/collection/action/ListCollection.java 2008-08-15 03:32:45 UTC (rev 62) @@ -7,6 +7,7 @@ import java.util.List; import org.blueoxygen.aconix.entity.ACollection; +import org.blueoxygen.cimande.CimandeAction; import org.blueoxygen.cimande.persistence.PersistenceAware; import org.blueoxygen.cimande.persistence.PersistenceManager; @@ -16,7 +17,7 @@ * @author heaven * */ -public class ListCollection extends ActionSupport implements PersistenceAware { +public class ListCollection extends CimandeAction implements PersistenceAware { private PersistenceManager manager; private List collections = new ArrayList(); protected ACollection collection; Modified: trunk/src/java/org/blueoxygen/aconix/collection/action/ListOrdered.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/collection/action/ListOrdered.java 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/java/org/blueoxygen/aconix/collection/action/ListOrdered.java 2008-08-15 03:32:45 UTC (rev 62) @@ -11,6 +11,7 @@ import java.util.List; import java.util.Set; +import org.blueoxygen.cimande.CimandeAction; import org.blueoxygen.cimande.descriptors.Descriptor; import org.blueoxygen.cimande.persistence.PersistenceAware; import org.blueoxygen.cimande.persistence.PersistenceManager; @@ -24,7 +25,7 @@ * @author heaven * */ -public class ListOrdered extends ActionSupport implements PersistenceAware{ +public class ListOrdered extends CimandeAction implements PersistenceAware{ private HibernateSessionFactory hsf; private PersistenceManager manager; private String orderedId=""; Modified: trunk/src/java/org/blueoxygen/aconix/pageCollection/action/PageCollectionForm.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/pageCollection/action/PageCollectionForm.java 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/java/org/blueoxygen/aconix/pageCollection/action/PageCollectionForm.java 2008-08-15 03:32:45 UTC (rev 62) @@ -13,6 +13,7 @@ import org.blueoxygen.aconix.entity.CollectionSelectedDetail; import org.blueoxygen.aconix.entity.PageCollection; import org.blueoxygen.aconix.entity.PageCollectionDetail; +import org.blueoxygen.cimande.CimandeAction; import org.blueoxygen.cimande.persistence.PersistenceAware; import org.blueoxygen.cimande.persistence.PersistenceManager; import org.blueoxygen.cimande.persistence.hibernate.HibernateSessionFactory; @@ -30,7 +31,7 @@ * @author heaven * */ -public class PageCollectionForm extends ActionSupport implements PersistenceAware, HibernateSessionFactoryAware { +public class PageCollectionForm extends CimandeAction implements PersistenceAware, HibernateSessionFactoryAware { private PersistenceManager manager; private HibernateSessionFactory hsf; private Session sess; Modified: trunk/src/template/view/frontpage/detail.vm =================================================================== --- trunk/src/template/view/frontpage/detail.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/frontpage/detail.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -2,7 +2,7 @@ <html> <head> <title>BlueOxygen Aconix</title> - <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <link type="text/css" rel="stylesheet" href="../style.css" > </head> <body> <center> Modified: trunk/src/template/view/frontpage/index.vm =================================================================== --- trunk/src/template/view/frontpage/index.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/frontpage/index.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -2,7 +2,7 @@ <html> <head> <title>BlueOxygen Aconix</title> - <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <link type="text/css" rel="stylesheet" href="../style.css" > </head> <body> <center> @@ -19,8 +19,18 @@ <td><a href="../frontpage/create.action?pCol.name=index">Home</a></td> </tr> <tr> - <td><a href="../backend/user/index.action">Login</a></td> + #if($currentUser) + <td><a href="../backend/user/logout.action">Logout</a></td> + + #else + <td><a href="../backend/user/index.action">Login</a></td> + #end </tr> + #if($currentUser) + <tr> + <td><a href="../backend/yuitree.action">Workspace</a></td> + </tr + #end <tr> <td><a href="http://home.blueoxygen.org/web/guest/about" target="blank">About Us</a></td> </tr> Modified: trunk/src/template/view/module/aconix/article/ArticleForm.vm =================================================================== --- trunk/src/template/view/module/aconix/article/ArticleForm.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/article/ArticleForm.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -2,15 +2,16 @@ <html> <head> <title>Article - Form</title> - <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <link type="text/css" rel="stylesheet" href="../../style.css" ></link> <script type="text/javascript"> - _editor_url = "../cimeng/jscript/htmlarea/"; + _editor_url = "../../jscript/htmlarea/"; _editor_lang = "en"; </script> - <script type="text/javascript" src="../cimeng/jscript/htmlarea/htmlarea.js"></script> + <script type="text/javascript" src="../../jscript/htmlarea/htmlarea.js"></script> </head> - <body onload="HTMLArea.replaceAll();"> + ##<body onload="HTMLArea.replaceAll();"> + <body> #if(!$actionErrors.isEmpty()) <div class="errorMessage">Error</div> <ul class="errorMessage"> Modified: trunk/src/template/view/module/aconix/article/edit.vm =================================================================== --- trunk/src/template/view/module/aconix/article/edit.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/article/edit.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -2,13 +2,13 @@ <html> <head> <title>Article - Form</title> - <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <link type="text/css" rel="stylesheet" href="../../style.css" > <script type="text/javascript"> - _editor_url = "/cimeng/jscript/htmlarea/"; + _editor_url = "../../jscript/htmlarea/"; _editor_lang = "en"; </script> - <script type="text/javascript" src="/cimeng/jscript/htmlarea/htmlarea.js"></script> + <script type="text/javascript" src="../../jscript/htmlarea/htmlarea.js"></script> </head> <body onload="HTMLArea.replaceAll();"> Modified: trunk/src/template/view/module/aconix/article/listArticle.vm =================================================================== --- trunk/src/template/view/module/aconix/article/listArticle.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/article/listArticle.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -3,7 +3,7 @@ <title>list - descriptors</title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta name="AUTHOR" content="Alex"> -<link rel="stylesheet" type="text/css" href="../../decorators/tables.css"> +<link rel="stylesheet" type="text/css" href="../../style.css"> </head> <body> Modified: trunk/src/template/view/module/aconix/article/result.vm =================================================================== --- trunk/src/template/view/module/aconix/article/result.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/article/result.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -2,7 +2,7 @@ <html> <head> <title>Collection - Form</title> - <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <link type="text/css" rel="stylesheet" href="../../style.css" > </head> <body> <table bgcolor="#000000" border="0" cellpadding="5" Modified: trunk/src/template/view/module/aconix/article/search.vm =================================================================== --- trunk/src/template/view/module/aconix/article/search.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/article/search.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -2,13 +2,13 @@ <html> <head> <title>Article - Form</title> - <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <link type="text/css" rel="stylesheet" href="../../style.css" > <script type="text/javascript"> - _editor_url = "/cimeng/jscript/htmlarea/"; + _editor_url = "../../jscript/htmlarea/"; _editor_lang = "en"; </script> - <script type="text/javascript" src="/cimeng/jscript/htmlarea/htmlarea.js"></script> + <script type="text/javascript" src="../../jscript/htmlarea/htmlarea.js"></script> </head> <body onload="HTMLArea.replaceAll();"> <form action="search.action" method="post"> Modified: trunk/src/template/view/module/aconix/article/success.vm =================================================================== --- trunk/src/template/view/module/aconix/article/success.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/article/success.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -2,7 +2,7 @@ <html> <head> <title>Article - Form</title> - <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <link type="text/css" rel="stylesheet" href="../../style.css" > </head> <body> <table width="98%" cellpadding="3" cellspacing="1" bgcolor="#000000"> Modified: trunk/src/template/view/module/aconix/collection/CollectionForm.vm =================================================================== --- trunk/src/template/view/module/aconix/collection/CollectionForm.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/collection/CollectionForm.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -2,7 +2,7 @@ <html> <head> <title>Collection - Form</title> - <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <link type="text/css" rel="stylesheet" href="../../style.css" > </head> <body> #if(!$actionErrors.isEmpty()) Modified: trunk/src/template/view/module/aconix/collection/OrderedCollection.vm =================================================================== --- trunk/src/template/view/module/aconix/collection/OrderedCollection.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/collection/OrderedCollection.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -2,7 +2,7 @@ <html> <head> <title>Collection - Form</title> - <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <link type="text/css" rel="stylesheet" href="../../style.css" > </head> <body> #if(!$actionErrors.isEmpty()) Modified: trunk/src/template/view/module/aconix/collection/SelectedCollection.vm =================================================================== --- trunk/src/template/view/module/aconix/collection/SelectedCollection.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/collection/SelectedCollection.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -2,7 +2,7 @@ <html> <head> <title>Collection - Form</title> - <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <link type="text/css" rel="stylesheet" href="../../style.css" > </head> <body> #if(!$actionErrors.isEmpty()) Modified: trunk/src/template/view/module/aconix/collection/confirmDelete.vm =================================================================== --- trunk/src/template/view/module/aconix/collection/confirmDelete.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/collection/confirmDelete.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -2,7 +2,7 @@ <html> <head> <title>Article - Form</title> - <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <link type="text/css" rel="stylesheet" href="../../style.css" > </head> <body> <table width="98%" cellpadding="3" cellspacing="1" bgcolor="#000000"> Modified: trunk/src/template/view/module/aconix/collection/edit.vm =================================================================== --- trunk/src/template/view/module/aconix/collection/edit.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/collection/edit.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -2,7 +2,7 @@ <html> <head> <title>Collection - Form</title> - <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <link type="text/css" rel="stylesheet" href="../../style.css" > </head> <body> #if(!$actionErrors.isEmpty()) Modified: trunk/src/template/view/module/aconix/collection/editOrdered.vm =================================================================== --- trunk/src/template/view/module/aconix/collection/editOrdered.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/collection/editOrdered.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -2,7 +2,7 @@ <html> <head> <title>Collection - Form</title> - <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <link type="text/css" rel="stylesheet" href="../../style.css" > </head> <body> #if(!$actionErrors.isEmpty()) Modified: trunk/src/template/view/module/aconix/collection/editSelected.vm =================================================================== --- trunk/src/template/view/module/aconix/collection/editSelected.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/collection/editSelected.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -2,7 +2,7 @@ <html> <head> <title>Collection - Form</title> - <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <link type="text/css" rel="stylesheet" href="../../style.css" > </head> <body> #if(!$actionErrors.isEmpty()) Modified: trunk/src/template/view/module/aconix/collection/listCollection.vm =================================================================== --- trunk/src/template/view/module/aconix/collection/listCollection.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/collection/listCollection.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -3,7 +3,7 @@ <title>list - descriptors</title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta name="AUTHOR" content="Alex"> -<link rel="stylesheet" type="text/css" href="../../decorators/tables.css"> +<link rel="stylesheet" type="text/css" href="../../style.css"> </head> <body> Modified: trunk/src/template/view/module/aconix/collection/listOrdered.vm =================================================================== --- trunk/src/template/view/module/aconix/collection/listOrdered.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/collection/listOrdered.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -3,7 +3,7 @@ <title>list - descriptors</title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta name="AUTHOR" content="Alex"> -<link rel="stylesheet" type="text/css" href="../../decorators/tables.css"> +<link rel="stylesheet" type="text/css" href="../../style.css"> </head> <body> Modified: trunk/src/template/view/module/aconix/collection/result.vm =================================================================== --- trunk/src/template/view/module/aconix/collection/result.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/collection/result.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -2,7 +2,7 @@ <html> <head> <title>Collection - Form</title> - <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <link type="text/css" rel="stylesheet" href="../../style.css" > </head> #if($!type == "selected") <body> Modified: trunk/src/template/view/module/aconix/collection/search.vm =================================================================== --- trunk/src/template/view/module/aconix/collection/search.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/collection/search.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -2,7 +2,7 @@ <html> <head> <title>Collection - Form</title> - <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <link type="text/css" rel="stylesheet" href="../../style.css" > </head> <body> #if(!$actionErrors.isEmpty()) Modified: trunk/src/template/view/module/aconix/collection/success.vm =================================================================== --- trunk/src/template/view/module/aconix/collection/success.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/collection/success.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -2,7 +2,7 @@ <html> <head> <title>Article - Form</title> - <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <link type="text/css" rel="stylesheet" href="../../style.css" > </head> <body> <table width="98%" cellpadding="3" cellspacing="1" bgcolor="#000000"> Modified: trunk/src/template/view/module/aconix/pageCollection/AddPageCollection.vm =================================================================== --- trunk/src/template/view/module/aconix/pageCollection/AddPageCollection.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/pageCollection/AddPageCollection.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -2,7 +2,7 @@ <html> <head> <title>Page Collection - Form</title> - <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <link type="text/css" rel="stylesheet" href="../../style.css" > </head> <body> #if(!$actionErrors.isEmpty()) Modified: trunk/src/template/view/module/aconix/pageCollection/PageCollectionForm.vm =================================================================== --- trunk/src/template/view/module/aconix/pageCollection/PageCollectionForm.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/pageCollection/PageCollectionForm.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -2,7 +2,7 @@ <html> <head> <title>Page Collection - Form</title> - <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <link type="text/css" rel="stylesheet" href="../../style.css" > </head> <body> #if(!$actionErrors.isEmpty()) Modified: trunk/src/template/view/module/aconix/pageCollection/preview.vm =================================================================== --- trunk/src/template/view/module/aconix/pageCollection/preview.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/pageCollection/preview.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -2,7 +2,7 @@ <html> <head> <title>BlueOxygen Aconix</title> - <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <link type="text/css" rel="stylesheet" href="../../style.css" > </head> <body> <center> Modified: trunk/src/template/view/module/aconix/pageCollection/result.vm =================================================================== --- trunk/src/template/view/module/aconix/pageCollection/result.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/pageCollection/result.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -2,7 +2,7 @@ <html> <head> <title>Collection - Form</title> - <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <link type="text/css" rel="stylesheet" href="../../style.css" > </head> <body> <table bgcolor="#000000" border="0" cellpadding="5" Modified: trunk/src/template/view/module/aconix/pageCollection/search.vm =================================================================== --- trunk/src/template/view/module/aconix/pageCollection/search.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/pageCollection/search.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -2,7 +2,7 @@ <html> <head> <title>Page Collection - Form</title> - <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <link type="text/css" rel="stylesheet" href="../../style.css" > </head> <body> <form action="search.action" method="post"> Modified: trunk/src/template/view/module/aconix/pageCollection/success.vm =================================================================== --- trunk/src/template/view/module/aconix/pageCollection/success.vm 2008-08-13 15:58:00 UTC (rev 61) +++ trunk/src/template/view/module/aconix/pageCollection/success.vm 2008-08-15 03:32:45 UTC (rev 62) @@ -2,7 +2,7 @@ <html> <head> <title>Article - Form</title> - <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <link type="text/css" rel="stylesheet" href="../../style.css" > </head> <body> <table width="98%" cellpadding="3" cellspacing="1" bgcolor="#000000"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kas...@us...> - 2008-08-13 15:57:55
|
Revision: 61 http://aconix.svn.sourceforge.net/aconix/?rev=61&view=rev Author: kaskuers Date: 2008-08-13 15:58:00 +0000 (Wed, 13 Aug 2008) Log Message: ----------- Perbaikan setelah testing 1. Text area pada article abstraction dan description diberi rich text 2. description pada article category telah diubah dari text area menjadi input type Modified Paths: -------------- trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java trunk/src/template/view/module/aconix/article/ArticleForm.vm trunk/src/template/view/module/aconix/article/edit.vm trunk/src/template/view/module/aconix/article/search.vm trunk/src/template/view/module/aconix/articleCategory/FilterArticleCategory.vm trunk/src/template/view/module/aconix/articleCategory/articleCategoryForm.vm Modified: trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java =================================================================== --- trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java 2008-08-13 11:14:19 UTC (rev 60) +++ trunk/src/java/org/blueoxygen/aconix/pageCollection/action/Preview.java 2008-08-13 15:58:00 UTC (rev 61) @@ -63,7 +63,7 @@ .getName() + " ORDER BY " + m.getOrderedBy() - + " LIMIT " + + " DESC LIMIT " + m.getLimitValue()); List r = new ArrayList(); List e = new ArrayList(); Modified: trunk/src/template/view/module/aconix/article/ArticleForm.vm =================================================================== --- trunk/src/template/view/module/aconix/article/ArticleForm.vm 2008-08-13 11:14:19 UTC (rev 60) +++ trunk/src/template/view/module/aconix/article/ArticleForm.vm 2008-08-13 15:58:00 UTC (rev 61) @@ -3,8 +3,14 @@ <head> <title>Article - Form</title> <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <script type="text/javascript"> + _editor_url = "../cimeng/jscript/htmlarea/"; + _editor_lang = "en"; + </script> + + <script type="text/javascript" src="../cimeng/jscript/htmlarea/htmlarea.js"></script> </head> - <body> + <body onload="HTMLArea.replaceAll();"> #if(!$actionErrors.isEmpty()) <div class="errorMessage">Error</div> <ul class="errorMessage"> @@ -35,7 +41,7 @@ Abstraction : </td> <td> - <textarea name="article.abstrak" rows="4">$!article.abstrak</textarea> + <textarea id="article_abstrak" name="article.abstrak" style="width: 80%" rows="15" cols="80">$!article.abstrak</textarea> </td> </tr> <tr bgcolor="#ffffff"> @@ -44,7 +50,7 @@ Description : </td> <td> - <textarea name="article.description" rows="4">$!article.description</textarea> + <textarea id="article_description" name="article.description" style="width: 80%" rows="15" cols="80">$!article.description</textarea> </td> </tr> <tr bgcolor="#ffffff"> Modified: trunk/src/template/view/module/aconix/article/edit.vm =================================================================== --- trunk/src/template/view/module/aconix/article/edit.vm 2008-08-13 11:14:19 UTC (rev 60) +++ trunk/src/template/view/module/aconix/article/edit.vm 2008-08-13 15:58:00 UTC (rev 61) @@ -3,8 +3,14 @@ <head> <title>Article - Form</title> <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <script type="text/javascript"> + _editor_url = "/cimeng/jscript/htmlarea/"; + _editor_lang = "en"; + </script> + + <script type="text/javascript" src="/cimeng/jscript/htmlarea/htmlarea.js"></script> </head> - <body> + <body onload="HTMLArea.replaceAll();"> <form action="update.action" method="post"> <table width="98%" cellpadding="3" cellspacing="1" bgcolor="#000000"> @@ -28,7 +34,7 @@ Abstraction : </td> <td> - <textarea name="article.abstrak" rows="4">$!article.abstrak</textarea> + <textarea id="article_abstrak" name="article.abstrak" style="width: 80%" rows="15" cols="80">$!article.abstrak</textarea> </td> </tr> <tr bgcolor="#ffffff"> @@ -36,7 +42,7 @@ Description : </td> <td> - <textarea name="article.description" rows="4">$!article.description</textarea> + <textarea id="article_description" name="article.description" style="width: 80%" rows="15" cols="80">$!article.description</textarea> </td> </tr> <tr bgcolor="#ffffff"> Modified: trunk/src/template/view/module/aconix/article/search.vm =================================================================== --- trunk/src/template/view/module/aconix/article/search.vm 2008-08-13 11:14:19 UTC (rev 60) +++ trunk/src/template/view/module/aconix/article/search.vm 2008-08-13 15:58:00 UTC (rev 61) @@ -3,8 +3,14 @@ <head> <title>Article - Form</title> <link type="text/css" rel="stylesheet" href="/cimeng/style.css" > + <script type="text/javascript"> + _editor_url = "/cimeng/jscript/htmlarea/"; + _editor_lang = "en"; + </script> + + <script type="text/javascript" src="/cimeng/jscript/htmlarea/htmlarea.js"></script> </head> - <body> + <body onload="HTMLArea.replaceAll();"> <form action="search.action" method="post"> <table width="98%" cellpadding="3" cellspacing="1" bgcolor="#000000"> <tr bgcolor="#d0dcff"> @@ -25,7 +31,7 @@ Abstraction : </td> <td> - <textarea name="article.abstrak" rows="4">$!article.abstrak</textarea> + <textarea id="article_abstrak" name="article.abstrak" style="width: 80%" rows="15" cols="80">$!article.abstrak</textarea> </td> </tr> <tr bgcolor="#ffffff"> @@ -33,7 +39,7 @@ Description : </td> <td> - <textarea name="article.description" rows="4">$!article.description</textarea> + <textarea id="article_description" name="article.description" style="width: 80%" rows="15" cols="80">$!article.description</textarea> </td> </tr> <tr bgcolor="#d0dcff"> Modified: trunk/src/template/view/module/aconix/articleCategory/FilterArticleCategory.vm =================================================================== --- trunk/src/template/view/module/aconix/articleCategory/FilterArticleCategory.vm 2008-08-13 11:14:19 UTC (rev 60) +++ trunk/src/template/view/module/aconix/articleCategory/FilterArticleCategory.vm 2008-08-13 15:58:00 UTC (rev 61) @@ -25,7 +25,7 @@ Description : </td> <td> - <textarea name="ACategory.description" rows="3" cols="20">$!ACategory.description</textarea> + <input name="ACategory.description" value="$!ACategory.description" type="text"> </td> </tr> <tr bgcolor="#d0dcff"> Modified: trunk/src/template/view/module/aconix/articleCategory/articleCategoryForm.vm =================================================================== --- trunk/src/template/view/module/aconix/articleCategory/articleCategoryForm.vm 2008-08-13 11:14:19 UTC (rev 60) +++ trunk/src/template/view/module/aconix/articleCategory/articleCategoryForm.vm 2008-08-13 15:58:00 UTC (rev 61) @@ -33,7 +33,7 @@ <font color="red">*</font>Description : </td> <td> - <textarea name="ACategory.description" rows="3" cols="20">$!ACategory.description</textarea> + <input name="ACategory.description" value="$!ACategory.description" type="text"> </td> </tr> <tr bgcolor="#ffffff"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kas...@us...> - 2008-08-13 11:14:10
|
Revision: 60 http://aconix.svn.sourceforge.net/aconix/?rev=60&view=rev Author: kaskuers Date: 2008-08-13 11:14:19 +0000 (Wed, 13 Aug 2008) Log Message: ----------- Added Paths: ----------- tags/1.0/ Removed Paths: ------------- tags/trunk/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |