Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:pum2pum/pum2pum

  • Loading branch information...
commit 3f09c5856f776e67b1a82e4dd9f3bbd51bf11269 2 parents bca78ad + d0d9caa
@nip3o nip3o authored
View
25 src/forum/examples/SubForumView/style.css
@@ -1,31 +1,48 @@
-.categoryTitle{
- background-color: red;
+#categoryView_info-table{
+ background-image: url("../../images/bgs/topbg.png");
+/* border: 1px solid #000000;*/
+ color: #FFFFFF;
+ width: 100%;
+ height: 43px;
+}
+
+.category{
+ background-image: url("../../images/bgs/headerbg.png");
+/* border: 1px solid #000000;*/
+ color: #FFFFFF;
+ height: 41px;
}
.subForumView{
- margin-left: 2%;
+ background-image: url("../../images/bgs/forumbg1.png");
}
.subForumTable{
width: 100%;
- margin-top: 0px;
}
.subForumTitle{
+ border-right: 1px solid #A0A0A0;
+ height: 60px;
width: 55%;
}
.subForumNewThreads{
+ border-right: 1px solid #A0A0A0;
+ text-align: center;
width: 15%;
left: 55%;
}
.subForumThreads{
+ border-right: 1px solid #A0A0A0;
+ text-align: center;
width: 15%;
left: 70%;
}
.subForumPosts{
+ text-align: center;
width: 15%;
left: 85%;
}
View
17 src/forum/kinds/Forum.CategoryView.js
@@ -4,8 +4,22 @@ enyo.kind({
tag: "div",
components: [
- { name: "btnNewSub", tag: "button", content: "New Category", ontap: "newCategory"},
+ //admin:
+ //{ name: "btnNewSub", tag: "button", content: "New Category", ontap: "newCategory"},
+ { name: "info-table", tag: "table", components: [
+ { tag: "tr", components: [
+ { tag: "td", style: "border-right: 1px solid #A0A0A0; width: 55%",
+ components: [ { tag: "p", content: "Forum" } ]},
+ { tag: "td", classes: "subForumNewThreads",
+ components: [ { tag: "p", content: "New threads" } ]},
+ { tag: "td", classes: "subForumThreads",
+ components: [ { tag: "p", content: "Threads" } ]},
+ { tag: "td", classes: "subForumPosts",
+ components: [ { tag: "p", content: "Posts" } ]}
+ ]},
+ ]},
+
{ name: "categories", tag: "ul" }
],
@@ -13,6 +27,7 @@ enyo.kind({
title: "",
},
+ //admin:
newCategory: function(){
categoryTitle = window.prompt("Category title");
categoryDescription = window.prompt("Category description");
View
17 src/forum/kinds/Forum.SubForumView.js
@@ -4,20 +4,8 @@ enyo.kind({
tag: "li",
components: [
- { name: "btnNewThread", tag: "button", content: "New SubForum", ontap: "newSubForum"},
-
- { tag: "table", classes: "subForumTable", components: [
- { tag: "tr", components: [
- { tag: "td", classes: "subForumTitle",
- components: [ { tag: "p", content: "Title / Description" } ]},
- { tag: "td", classes: "subForumNewThreads",
- components: [ { tag: "p", content: "New threads" } ]},
- { tag: "td", classes: "subForumThreads",
- components: [ { tag: "p", content: "Threads" } ]},
- { tag: "td", classes: "subForumPosts",
- components: [ { tag: "p", content: "Posts" } ]}
- ]},
- ]},
+ //admin:
+ //{ name: "btnNewThread", tag: "button", content: "New SubForum", ontap: "newSubForum"},
{ name: "subForum", tag: "table", classes: "subForumTable" }
],
@@ -26,6 +14,7 @@ enyo.kind({
category: ""
},
+ //admin:
newSubForum: function(){
subForumTitle = window.prompt("SubForum title");
subForumDescrition = window.prompt("SubForum description");
Please sign in to comment.
Something went wrong with that request. Please try again.