Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F849395
in-portal
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Sun, Apr 20, 5:04 PM
Size
56 KB
Mime Type
text/x-diff
Expires
Tue, Apr 22, 5:04 PM (18 h, 13 m)
Engine
blob
Format
Raw Data
Handle
603869
Attached To
rINP In-Portal
in-portal
View Options
Index: branches/5.0.x/themes/simple/sitemap.tpl
===================================================================
--- branches/5.0.x/themes/simple/sitemap.tpl (nonexistent)
+++ branches/5.0.x/themes/simple/sitemap.tpl (revision 12609)
@@ -0,0 +1,36 @@
+<!--##
+<NAME>Sitemap</NAME>
+<DESC>Sitemap of the website</DESC>
+<SECTION></SECTION>
+##-->
+
+<!--## DEFINE MAIN CONTENT ELEMENT ##-->
+<inp2:m_DefineElement name="content">
+
+ <div class="movable-element">
+ <div id="block-latest" class="block">
+ <div class="round-top"></div>
+ <div class="content">
+ <h1 class="movable-header"><inp2:st_PageInfo type="title"/></h1>
+ <inp2:st_ContentBlock num="1"/>
+
+ <inp2:m_DefineElement name="sitemap_element">
+ <li>
+ <a href="<inp2:m_if check='m_Param' name='external_url'><inp2:m_Param name='external_url'/><inp2:m_else/><inp2:m_Link template='$template' m_cat_id='$cat_id' m_cat_page='1'/></inp2:m_if>" title="<inp2:m_Param name="title"/>"><inp2:m_Param name="title"/></a>
+ </li>
+ </inp2:m_DefineElement>
+
+ <ul>
+ <inp2:st_CachedMenu render_as="sitemap_element" category_id="1" per_page="-1"/>
+ </ul>
+ </div>
+ <div class="round-bottom"></div>
+ </div>
+ </div>
+
+</inp2:m_DefineElement>
+<!--## /DEFINE MAIN CONTENT ELEMENT ##-->
+
+<!--## INCLUDE MAIN DESIGN TEMPLATE ##-->
+<inp2:m_include template="designs/default_design.des"/>
+<!--## /INCLUDE MAIN DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/5.0.x/themes/simple/sitemap.tpl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/5.0.x/themes/simple/search-results.tpl
===================================================================
--- branches/5.0.x/themes/simple/search-results.tpl (nonexistent)
+++ branches/5.0.x/themes/simple/search-results.tpl (revision 12609)
@@ -0,0 +1,40 @@
+<!--##
+<NAME>Search Results</NAME>
+<DESC>Search Results</DESC>
+<SECTION></SECTION>
+##-->
+
+<!--## DEFINE MAIN CONTENT ELEMENT ##-->
+<inp2:m_DefineElement name="content">
+
+ <div class="movable-element">
+ <div id="block-latest" class="block">
+ <div class="round-top"></div>
+ <div class="content">
+ <inp2:st_InitList list_name="search_results" types="search" parent_cat_id="any" recursive="1"/>
+
+ <h1 class="movable-header"><inp2:m_phrase name="lu_title_SearchResults"/> (<inp2:st_TotalRecords list_name="search_results"/>)</h1>
+ <inp2:m_if check="st_TotalRecords" list_name="search_results">
+ <inp2:m_DefineElement name="search_element">
+ <li>
+ <a href="<inp2:m_if check='m_Param' name='external_url'><inp2:m_Param name='external_url'/><inp2:m_else/><inp2:m_Link template='$template' m_cat_id='$cat_id' m_cat_page='1'/></inp2:m_if>" title="<inp2:m_Param name="title"/>"><inp2:m_Param name="title"/></a>
+ </li>
+ </inp2:m_DefineElement>
+
+ <ul>
+ <inp2:st_PrintList list_name="search_results" render_as="search_element" per_page="-1"/>
+ </ul>
+ <inp2:m_else/>
+ <inp2:m_Phrase label="lu_text_NothingFound"/>!
+ </inp2:m_if>
+ </div>
+ <div class="round-bottom"></div>
+ </div>
+ </div>
+
+</inp2:m_DefineElement>
+<!--## /DEFINE MAIN CONTENT ELEMENT ##-->
+
+<!--## INCLUDE MAIN DESIGN TEMPLATE ##-->
+<inp2:m_include template="designs/default_design.des"/>
+<!--## /INCLUDE MAIN DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/5.0.x/themes/simple/search-results.tpl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/5.0.x/themes/simple/.smsignore
===================================================================
--- branches/5.0.x/themes/simple/.smsignore (nonexistent)
+++ branches/5.0.x/themes/simple/.smsignore (revision 12609)
@@ -0,0 +1,2 @@
+search-results\.tpl
+recommend\.tpl
\ No newline at end of file
Property changes on: branches/5.0.x/themes/simple/.smsignore
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/5.0.x/themes/simple/index.tpl
===================================================================
--- branches/5.0.x/themes/simple/index.tpl (revision 12608)
+++ branches/5.0.x/themes/simple/index.tpl (revision 12609)
@@ -1,30 +1,25 @@
<!--##
<NAME>Home</NAME>
<DESC>Home page</DESC>
<SECTION></SECTION>
##-->
+<!--## DEFINE MAIN CONTENT ELEMENT ##-->
<inp2:m_DefineElement name="content">
- <div class="movable-area">
- <div class="movable-element">
- <inp2:m_include template="platform/elements/navigation_bar.elm"/>
- </div>
- <div class="movable-element">
- <inp2:m_RenderElement design="content_box">
- <inp2:m_Capture to_var="header">
- <inp2:m_phrase name="lu_title_WelcomeTitle"/>
- </inp2:m_Capture>
+ <div class="movable-element">
+ <div id="block-latest" class="block">
+ <div class="round-top"></div>
+ <div class="content">
<inp2:st_ContentBlock num="1"/>
- </inp2:m_RenderElement>
- </div>
- <div class="movable-element">
- <!--## INCLUDE HOME PAGE ELEMENTS FOR EACH MODULE ##-->
- <inp2:m_ModuleInclude template="elements/content_boxes/home_page_items.elm" data_exists="1"/>
- <!--## /HOME PAGE ELEMENTS ##-->
+ </div>
+ <div class="round-bottom"></div>
</div>
</div>
+
</inp2:m_DefineElement>
-<!--## /MAIN CONTENT ##-->
+<!--## /DEFINE MAIN CONTENT ELEMENT ##-->
-<inp2:m_include template="designs/default_design.des"/>
\ No newline at end of file
+<!--## INCLUDE MAIN DESIGN TEMPLATE ##-->
+<inp2:m_include template="designs/default_design.des"/>
+<!--## /INCLUDE MAIN DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/5.0.x/themes/simple/recommend.tpl
===================================================================
--- branches/5.0.x/themes/simple/recommend.tpl (nonexistent)
+++ branches/5.0.x/themes/simple/recommend.tpl (revision 12609)
@@ -0,0 +1,26 @@
+<!--##
+<NAME>Recommend to a Friend</NAME>
+<DESC>Recommend to a Friend</DESC>
+<SECTION></SECTION>
+##-->
+
+<!--## DEFINE MAIN CONTENT ELEMENT ##-->
+<inp2:m_DefineElement name="content">
+
+ <div class="movable-element">
+ <div id="block-latest" class="block">
+ <div class="round-top"></div>
+ <div class="content">
+ <h1 class="movable-header"><inp2:m_Phrase label="lu_title_RecommendSite"/></h1>
+ <inp2:st_ContentBlock num="1"/>
+ </div>
+ <div class="round-bottom"></div>
+ </div>
+ </div>
+
+</inp2:m_DefineElement>
+<!--## /DEFINE MAIN CONTENT ELEMENT ##-->
+
+<!--## INCLUDE MAIN DESIGN TEMPLATE ##-->
+<inp2:m_include template="designs/default_design.des"/>
+<!--## /INCLUDE MAIN DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/5.0.x/themes/simple/recommend.tpl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/5.0.x/themes/simple/terms.tpl
===================================================================
--- branches/5.0.x/themes/simple/terms.tpl (nonexistent)
+++ branches/5.0.x/themes/simple/terms.tpl (revision 12609)
@@ -0,0 +1,26 @@
+<!--##
+<NAME>Terms and Conditions</NAME>
+<DESC></DESC>
+<SECTION></SECTION>
+##-->
+
+<!--## DEFINE MAIN CONTENT ELEMENT ##-->
+<inp2:m_DefineElement name="content">
+
+ <div class="movable-element">
+ <div id="block-latest" class="block">
+ <div class="round-top"></div>
+ <div class="content">
+ <h1 class="movable-header"><inp2:st_PageInfo type="title"/></h1>
+ <inp2:st_ContentBlock num="1"/>
+ </div>
+ <div class="round-bottom"></div>
+ </div>
+ </div>
+
+</inp2:m_DefineElement>
+<!--## /DEFINE MAIN CONTENT ELEMENT ##-->
+
+<!--## INCLUDE MAIN DESIGN TEMPLATE ##-->
+<inp2:m_include template="designs/default_design.des"/>
+<!--## /INCLUDE MAIN DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/5.0.x/themes/simple/terms.tpl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/5.0.x/themes/simple/inc/content.css
===================================================================
--- branches/5.0.x/themes/simple/inc/content.css (revision 12608)
+++ branches/5.0.x/themes/simple/inc/content.css (revision 12609)
@@ -1,521 +1,215 @@
/* -- RSS Feed Icon -- */
.link-rss a {
background:url('../img/icon-rss.png') no-repeat left top;
display:block;
height:19px;
text-indent:-999em;
width:19px;
}
/* !Home Blocks
--------------------- */
/* -- !Default -- */
.block {
background:#FFF;
border:1px solid #e8e9e9;
margin:0 0 16px;
padding:16px;
}
.block p {
margin:15px 0 0;
}
/* Headings */
.block h3 {
border-bottom:2px solid #EFEFEF;
color:#757575;
font-size:1.5em;
font-weight:400;
margin:0 0 7px;
padding-left:3px;
}
.block h3 strong {
color:#92af1c;
font-weight:400;
}
/* Lists */
#content .block ul {
margin:0;
}
/* With Rounded Corners */
#side-box,
#side-box-plain {
border-width:0 1px;
padding:0 16px;
}
#side-box .round-top-red {
background:url('../img/bg-side-box-top-red.png') no-repeat left top;
height:16px;
margin:0 -17px;
}
#side-box .round-bottom,
#side-box-plain .round-bottom {
background:url('../img/bg-side-box-bottom.png') no-repeat left bottom;
height:16px;
margin:0 -17px;
}
#side-box .round-top,
#side-box-plain .round-top {
background:url('../img/bg-side-box-top.png') no-repeat left top;
height:16px;
margin:0 -17px;
}
/* -- !Side Box -- */
#side-box h3 {
background:#960c03 url('../img/bg-side-box-top-red.png') no-repeat left top;
border:none;
color:#FFF;
font-size:1.16em;
font-weight:700;
margin:0 -11px 12px;
padding:7px 10px 6px;
}
#side-box label {
background:url('../img/icon-email.png') no-repeat left center;
color:#9b9b9b;
font-size:12px;
display:block;
line-height:19px;
padding:0 0 0 27px;
}
#side-box .emailfield input {
border:1px solid #e3e4e4;
display:block;
margin:7px 0 15px;
padding:3px;
width:164px;
}
#side-box .submit input {
background:url('../img/bg-form-email-submit.png') no-repeat left top;
border:none;
color:#666;
cursor:pointer;
float:right;
font-size:11px;
margin:0;
padding:0;
height:22px;
width:70px;
}
#side-box .submit input:hover {
background-image:url('../img/bg-form-email-submit-hover.png');
color:#FFF;
}
#side-box span#errormsg {
color:red;
}
/* Remove Top Rounded Corner */
#side-box .round-top {
display:none;
}
#side-box {
padding:0 10px;
}
#side-box .round-bottom {
margin:0 -11px;
}
#side-box .link-rss,
#side-box-plain .link-rss {
position:absolute;
margin:17px;
right:0;
top:0;
}
/* validation style */
#side-box label.error {
background:none;
padding:0;
color:red;
}
/* -- Main Content -- */
#content-main {
background:none;
border:none;
padding:0;
}
#content-main .block {
background:#FFF;
border:1px solid #e8e9e9;
border-width:1px;
padding:20px;
}
/* With Rounded Corners */
#content-main .block {
border-width:0 1px;
padding:0 20px;
}
#content-main .round-top {
background:url('../img/bg-content-top.png') no-repeat left top;
height:21px;
margin:0 -21px;
}
#content-main .round-bottom {
background:url('../img/bg-content-bottom.png') no-repeat left bottom;
height:21px;
margin:0 -21px;
}
/* -- !Latest -- */
#block-latest .feature {
background:url('../img/bg-block-latest-featured.png') no-repeat 237px top;
color:#666;
margin:5px 0 0;
padding:10px 0 0 194px;
position:relative;
}
* html #block-latest .feature {
height:125px;
}
#block-latest .feature-1 {
background:none;
margin:0;
padding-top:0;
}
#block-latest .feature img {
float:left;
margin:0 0 0 -194px;
padding-right:10px;
}
#block-latest .feature h4 {
margin:0 0 5px;
}
#block-latest .feature p {
margin:5px 0 0;
float: left;
width: 245px;
}
-
-/* -- !Events -- */
-#block-events {
-position:relative;
-}
-
-#block-events h3 {
-border:none;
-}
-
-#block-events h3 strong {
-color:#a60d03;
-}
-
-#block-events .link-rss {
-position:absolute;
-margin:21px;
-right:0;
-top:0;
-}
-
-#block-events .link {
-text-align:right;
-}
-
-#block-events ul.event-listing li.last-child {
-border:none;
-padding-bottom:0;
-}
-
-/* !Intro
---------------------- */
-#content .teaser {
-margin:0 0 45px;
-}
-
-/* !Events
---------------------- */
-#events {
-width:692px;
-}
-
-/* -- !Header -- */
-#events .header {
-background:#e5e9f4 url('../img/bg-events-header.png') no-repeat left top;
-padding:20px 15px 0 8px;
-}
-
-#events .header h2 {
-border:none;
-padding:0;
-color:#485357;
-float:left;
-font-size:1em;
-font-weight:700;
-line-height:20px;
-margin:0;
-width:auto;
-}
-
-/* Select Year */
-#events .header #select-year {
-float:right;
-}
-
-#events .header form {
-display:inline;
-}
-
-#events .header #select-year label,#events .header #select-year select,#events .header #select-year .submit {
-float:left;
-margin:0 0 0 8px;
-}
-
-#events .header #select-year label {
-color:#485357;
-font-weight:700;
-line-height:20px;
-}
-
-#events .header #select-year .submit input {
-background:#7e7e7e url('../img/bg-form-go.png') no-repeat left top;
-border:none;
-color:#FFF;
-cursor:pointer;
-display:block;
-font-size:11px;
-height:19px;
-padding:0;
-width:29px;
-}
-
-/* Select Month */
-#events .header #select-month {
-background:url('../img/bg-events-header-ul.png') repeat-x left bottom;
-clear:both;
-float:left;
-margin:15px -16px 0 -9px;
-padding:0 16px 1px 9px;
-width:100%;
-}
-
-#events .header #select-month li {
-background:none;
-display:inline;
-margin:0;
-padding:0;
-}
-
-#events .header #select-month a {
-background:#e7e9ee url('../img/bg-events-header-month.png') no-repeat left top;
-border:1px solid #bfc1ce;
-border-width:1px 1px 0;
-color:#485357;
-display:block;
-float:left;
-margin:0 0 0 5px;
-padding:2px 0 0;
-line-height:20px;
-text-align:center;
-text-decoration:none;
-width:49px;
-}
-
-#events .header #select-month li.first-child a,#events .header #select-month li:first-child a {
-margin-left:0;
-}
-
-#events .header #select-month a.active,#events .header #select-month a.active:hover,#events .header #select-month .ui-tabs-selected a,#events .header #select-month a:hover {
-background:#a60d03;
-bottom:-1px;
-color:#FFF;
-font-weight:700;
-height:21px;
-margin-top:-1px;
-position:relative;
-}
-
-#events .header #select-month a:hover {
-font-weight:400;
-}
-
-/* -- !Content -- */
-#events .content {
-border:1px solid #d9dbea;
-border-width:0 1px 1px;
-padding:20px 15px 15px;
-}
-
-#events .content h3 {
-color:#485357;
-font-size:1.17em;
-font-weight:700;
-line-height:1;
-margin:0;
-}
-
-/* Event Listing */
-#content ul.event-listing {
-margin:15px 0 0;
-padding:0;
-}
-
-#content ul.event-listing li,#content .event-listing div.event {
-background:none;
-border-bottom:2px solid #f3f3f1;
-list-style:none;
-margin:0 0 15px;
-padding:0 0 15px 85px;
-}
-
-/* Date */
-.event-listing .date {
-background:#f2f2f2;
-font-weight:400;
-float:left;
-margin:0 0 0 -85px;
-padding:8px 0;
-text-align:center;
-width:52px;
-}
-
-.event-listing .date .day {
-color:#a60d03;
-display:block;
-font-size:24px;
-line-height:1;
-margin:0 0 2px;
-}
-
-.event-listing .date .month {
-color:#575757;
-display:block;
-font-size:10px;
-line-height:1;
-text-transform:uppercase;
-}
-
-/* Event Details */
-.event-listing h4,.event-listing p {
-margin:0;
-}
-
-/* Pad Underline on events page */
-#events .event-listing h4 {
-margin:0 0 10px;
-}
-
-#events .event-listing h4 a {
-text-decoration:underline;
-}
-
-.event-listing h4 {
-font-weight:400;
-font-size:1em;
-}
-
-.event-listing p {
-color:#666;
-}
-
-.event-listing p.details {
-color:#9b9b9b;
-}
-
-/* -- UI Tab Panels -- */
-.ui-tabs-hide {
-display:none;
-}
-
-#select-month {
-display:none;
-}
-
-#select-month {
-display:block;
-}
-
-/* Look good without JS */
-#events .content div.event-listing h3 {
-font-weight:400;
-margin:10px 0;
-}
-
-/* !Registration
---------------------- */
-.important {
-font-size:1.3em;
-padding:1em 1em 1.5em;
-}
-
-.registration {
-width:490px;
-}
-
-.registration #registrationresultssummary li {
-list-style:none;
-background:none;
-padding:0 0 3px;
-margin:0;
-}
-
-.registration #registrationresultssummary ul,.registration #registrationresultssummary td {
-padding:0;
-margin:0;
-}
-
-.payment-options .creditcard {
-border-bottom:1px solid #333;
-}
-
-/* layout amends for residency information */
-.residency .image {
-float:left;
-clear:both;
-margin:0 1.3em 0 0;
-}
-
-.residency {
-overflow:hidden;
-margin:.6em 0 1.6em;
-}
-
-.residency h3 {
-margin-top:.5em;
-}
-
-.residency p,.residency h3,.leaders-program-content h2,.leaders-program-content p {
-margin-left:135px!important;
-}
-
-.residency table td {
-width:49%;
-}
-
-/* leaders program */
-.leaders-program-content img {
-float:left;
-clear:both;
-margin:0 1.3em 0 0;
-}
-
-body.leaders-program p {
-/* margin-left: 60px; */
-text-align:left!important;
-}
\ No newline at end of file
Index: branches/5.0.x/themes/simple/inc/print.css
===================================================================
--- branches/5.0.x/themes/simple/inc/print.css (revision 12608)
+++ branches/5.0.x/themes/simple/inc/print.css (revision 12609)
@@ -1,50 +1,42 @@
-/*
- Running MySource Matrix
- Developed by Squiz - http://www.squiz.net
- MySource, MySource Matrix and Squiz.net are registered Trademarks of Squiz Pty Ltd
- Page generated: 18 September 2009 22:45:54
-*/
-
-
@import url(typography.css);
-
+
#nav, #nav-sec, #nav-sub, #content-tools, #nav-accessibility, #masthead form, #site-info ul {
display: none;
}
h1#branding {
font-size: 1.5em;
text-indent: 0;
}
#site-info {
background: #FFF;
color: #ccc;
font-size: 0.82em;
}
#site-info p, #site-info p a:link {
color: #ccc;
}
/* !Registration
--------------------- */
.important { font-size: 1.3em; padding: 1em 1em 1.5em 1em; }
.registration { width: 490px; }
.registration #registrationresultssummary li {
list-style: none;
background: none;
padding: 0 0 3px 0;
margin: 0;
}
.registration #registrationresultssummary ul, .registration #registrationresultssummary td {
padding: 0;
margin: 0;
}
.payment-options .creditcard {
border-bottom: 1px solid rgb(51, 51, 51);
}
Index: branches/5.0.x/themes/simple/inc/layout.css
===================================================================
--- branches/5.0.x/themes/simple/inc/layout.css (revision 12608)
+++ branches/5.0.x/themes/simple/inc/layout.css (revision 12609)
@@ -1,582 +1,528 @@
html {
margin:0;
padding:0;
}
body {
margin:0;
padding:28px 0 0;
background: #f8f8f8 url('../img/bg-body.png') repeat-x left top;
}
#wrapper {
margin:0 auto;
width:945px;
height:auto;
}
#content {
clear:both;
position:relative;
}
-
#content-main {
background:#FFF;
float:left;
+ margin:0 13px;
+ width:531px;
+}
+
+#content-main.inner {
margin:0 0 20px 13px;
- width:696px;
+ width:738px;
}
#content-main {
margin:0 13px;
width:531px;
}
#content-ter {
float:left;
width:194px;
}
#content-sec {
float:left;
margin:0 0 20px;
width:194px;
}
#site-info {
clear:both;
}
/* !Layout - Other
--------------------- */
#nav-accessibility {
display:none;
}
hr {
display:none;
}
/* !Masthead
--------------------- */
#masthead {
background:#a60d03;
clear:both;
height:138px;
position:relative;
}
-.home #masthead {
-background-image:url('../img/bg-masthead-home.png');
-}
-
.inside #masthead {
margin-top:-19px;
padding-top:19px;
}
-.events #masthead {
-background-image:url(../img/bg-masthead-events.png);
-margin-top:-11px;
-padding-top:11px;
-}
-
-.media-center #masthead {
-background-image:url(../img/bg-masthead-media-center.png);
-margin-top:-15px;
-padding-top:15px;
-}
-
-.about-asialink #masthead {
-background-image:url(../img/bg-masthead-about-asialink.png);
-margin-top:-19px;
-padding-top:19px;
-}
-
-.support-us #masthead {
-background-image:url(../img/bg-masthead-support-us.png);
-margin-top:-12px;
-padding-top:12px;
-}
-
-.arts #masthead {
-background-image:url(../img/bg-masthead-arts.png);
-margin-top:-19px;
-padding-top:19px;
-}
-
-.leaders-program #masthead {
-background-image:url(../img/bg-masthead-leaders-program.png);
-margin-top:-17px;
-padding-top:17px;
-}
-
-.corporate-programs #masthead {
-background-image:url(../img/bg-masthead-corporate-programs.png);
-margin-top:-1px;
-padding-top:1px;
-}
-
-.community-health #masthead {
-background-image:url(../img/bg-masthead-community-health.png);
-margin-top:-6px;
-padding-top:6px;
-}
-
-.school-education #masthead {
-background-image:url(../img/bg-masthead-school-education.png);
-margin-top:-17px;
-padding-top:17px;
-}
-
/* -- !Branding -- */
h1#branding {
position:relative;
top:-13px;
left:-4px;
}
h1#branding a {
-background:url(../img/logo.png) no-repeat left top;
+background:url('../img/logo.png') no-repeat left top;
display:block;
height:105px;
text-indent:-999em;
width:220px;
}
/* -- !Intro -- */
#intro {
position:absolute;
right:-8px;
top:-17px;
}
/* -- !Secondary Navigation -- */
#nav-sec {
clear:both;
margin:8px 0 9px 19px;
}
/* Adjust for border on hover */
#nav-sec {
margin-bottom:9px;
}
#nav-sec li {
background:url('../img/bg-nav-sec-li.png') no-repeat left center;
float:left;
margin:0 0 0 15px;
padding:0 0 0 16px;
}
#nav-sec li.first-child {
background:none;
margin:0;
padding:0;
}
#nav-sec a {
color:#FFF;
display:block;
font-weight:700;
line-height:32px;
padding:0 0 2px;
text-decoration:none;
}
#nav-sec a:hover {
color:#000;
text-decoration:underline;
}
/* Red Border on Hover */
.js #nav-sec li a:hover {
text-decoration:none;
}
#nav-sec li a div {
padding:0 0 2px;
margin:0 -5px -2px;
position:relative;
top:-9px;
}
#nav-sec li a:hover div {
border-bottom:2px solid #c4160b;
padding:0;
}
/* -- !Navigation -- */
ul#nav {
-background:#282828 url(../img/bg-nav.png) repeat-x left top;
+background:#282828 url('../img/bg-nav.png') repeat-x left top;
border-top:1px solid #FFF;
font-size:12px;
margin:0;
}
#nav li {
float:left;
margin:0;
}
#nav li a {
background:url('../img/bg-nav.png') no-repeat left -35px;
color:#FFF;
display:block;
font-weight:700;
line-height:32px;
padding:0 18px 2px 17px;
text-align:center;
text-decoration:none;
}
#nav li:hover a,#nav li.hover a,#nav li a.active {
background:url('../img/bg-nav.png') no-repeat left -70px;
}
#nav li a:hover {
text-decoration:underline;
}
/* Rounded Corner */
#nav li:first-child a,#nav li.first-child a {
-background:url(../img/bg-nav.png) no-repeat left -105px;
+background:url('../img/bg-nav.png') no-repeat left -105px;
}
#nav li:first-child:hover a,#nav li:first-child a.active,#nav li.first-child:hover a,#nav li.first-child-hover a,#nav li.first-child a.active {
-background:url(../img/bg-nav.png) no-repeat left -140px;
+background:url('../img/bg-nav.png') no-repeat left -140px;
}
/* Contact Us */
#nav li.last-child a {
-background:url(../img/bg-nav.png) no-repeat left -315px;
+background:url('../img/bg-nav.png') no-repeat left -315px;
}
/* Red Border on Hover */
#nav li a:hover {
text-decoration:none;
}
#nav li a div {
padding:0 0 2px;
margin:0 -5px -4px;
position:relative;
top:-8px;
}
#nav li:hover a div,#nav li.hover a div {
border:1px solid #a60d03;
padding:0;
}
/* Second Level */
#nav li ul {
background:#000;
display:block;
padding:4px 0 1px;
position:absolute;
left:-999em;
width:220px;
z-index:100;
}
#nav li ul li {
background:none;
clear:both;
width:100%;
}
#wrapper #nav li ul li a {
background:none;
border:1px solid #313131;
border-width:0 0 1px;
display:block;
font-size:11px;
line-height:1.2;
padding:5px 17px;
text-align:left;
}
#wrapper #nav li ul li a:hover {
background:#282828;
}
#nav li:hover ul,#nav li.hover ul {
left:auto;
}
/* -- !Search Form -- */
#masthead form {
background:#282828 url('../img/bg-form-search.png') no-repeat right top;
border-top:1px solid #FFF;
bottom:0;
position:absolute;
right:0;
height:32px;
width:180px;
}
#masthead form fieldset {
padding:6px 6px 0 0;
float:right;
}
#masthead form label {
display:none;
}
#masthead form input.sq-form-field,
#masthead form .submit input {
border:1px solid #e3e4e4;
display:block;
float:left;
font-size:10px;
padding:2px 2px 1px;
width:109px;
}
#masthead form .submit input {
background:url('../img/bg-form-search-submit.png') no-repeat left top;
border:none;
color:#FFF;
cursor:pointer;
cursor:hand;
font-weight:700;
height:18px;
width:53px;
}
/* !Breadcrumb
--------------------- */
#breadcrumb {
color:#4790b4;
float:left;
font-size:.91em;
line-height:31px;
margin:0 0 0 4px;
}
#breadcrumb a {
color:#4790b4;
}
/* !Content Tools
--------------------- */
#content-tools {
float:right;
margin:10px 23px 0 10px;
}
#content-tools li {
display:inline;
}
#content-tools a {
-background:url(../img/ir-content-tools.png) no-repeat 0 50%;
+background:url('../img/ir-content-tools.png') no-repeat 0 50%;
display:block;
float:left;
height:11px;
margin:0 0 0 14px;
outline:none;
text-indent:-999em;
}
#content-tools #send-to-friend a {
width:13px;
}
#content-tools #text-size #text-decrease {
background-position:-23px 50%;
margin:0 0 0 12px;
width:5px;
}
#content-tools #text-size #text-increase {
background-position:-33px 50%;
margin:0 0 0 5px;
width:6px;
}
#content-tools #print-version a {
background-position:-54px 50%;
width:12px;
}
#content-tools #text-version a {
background-position:-80px 50%;
width:10px;
}
/* !Site Information
--------------------- */
#site-info {
margin:20px 0 0;
}
#site-info ul {
background:url('../img/bg-nav.png') repeat-x 0 -350px;
}
#site-info ul li {
float:left;
margin:0;
}
#site-info ul li a {
background:url('../img/bg-nav.png') no-repeat left -35px;
color:#FFF;
display:block;
font-weight:700;
line-height:34px;
padding:0 21px 0 20px;
text-align:center;
text-decoration:none;
}
#site-info ul li a:hover,
#site-info ul li a.active {
background:url('../img/bg-nav.png') no-repeat left -70px;
}
#site-info ul li a:hover {
text-decoration:underline;
}
/* Rounded Corner */
#site-info ul li:first-child a,
#site-info ul li.first-child a {
background:url('../img/bg-nav.png') no-repeat left -175px;
}
#site-info ul li:first-child a:hover,
#site-info ul li:first-child a.active,
#site-info ul li.first-child a:hover,
#site-info ul li.first-child a.active {
background:url('../img/bg-nav.png') no-repeat left -210px;
}
/* Back to top */
#site-info ul li.last-child {
float:right;
}
#site-info ul li.last-child a {
background:url('../img/bg-nav.png') no-repeat right -245px;
}
#site-info ul li.last-child a:hover,
#site-info ul li.last-child a.active {
background:url('../img/bg-nav.png') no-repeat right -280px;
}
/* Red Border on Hover */
#site-info ul li a:hover {
text-decoration:none;
}
#site-info ul li a div {
display:block;
padding:0 0 2px;
margin:0 -5px -4px;
position:relative;
top:-8px;
}
#site-info ul li a:hover div {
border-bottom:2px solid #a60d03;
padding:0;
}
/* !Borders
--------------------- */
#content-main {
border:1px solid #e8e9e9;
border-width:0 1px;
padding:0 20px;
}
-#content-main .round-top {
-background:url(../img/bg-content-inside-top.png) no-repeat left top;
+#content-main.inner .round-top {
+background:url('../img/bg-content-inside-top.png') no-repeat left top;
height:21px;
margin:0 -21px;
}
-#content-main .round-bottom {
-background:url(../img/bg-content-inside-bottom.png) no-repeat left bottom;
+#content-main.inner .round-bottom {
+background:url('../img/bg-content-inside-bottom.png') no-repeat left bottom;
height:21px;
margin:0 -21px;
}
/* !Sub Navigation
--------------------- */
#nav-sub {
-background:#46474b url(../img/bg-nav-sub-bottom.png) no-repeat left bottom;
+background:#46474b url('../img/bg-nav-sub-bottom.png') no-repeat left bottom;
}
#nav-sub ul {
-background:url(../img/bg-nav-sub-top.png) no-repeat left top;
+background:url('../img/bg-nav-sub-top.png') no-repeat left top;
list-style:none;
margin:0;
padding:15px 0;
}
#nav-sub ul li {
display:inline;
margin:0;
padding:0;
}
#nav-sub li a {
-background:url(../img/bg-nav-sub-li.png) no-repeat 12px .65em;
+background:url('../img/bg-nav-sub-li.png') no-repeat 12px .65em;
border-bottom:1px solid #1c1d21;
color:#FFF;
display:block;
margin:0 1px;
padding:3px 12px 3px 25px;
}
#nav-sub li.expanded a {
-background:#6a6b6d url(../img/bg-nav-sub-li-expanded.png) no-repeat 10px .65em;
+background:#6a6b6d url('../img/bg-nav-sub-li-expanded.png') no-repeat 10px .65em;
text-decoration:none;
}
#nav-sub li a:hover {
background-color:#6a6b6d;
text-decoration:none;
}
#nav-sub li.current a {
background-color:#6a6d6d;
}
/* Level 2 */
#nav-sub ul ul {
background:none;
border-bottom:1px solid #1c1d21;
padding:0;
}
#nav-sub li.expanded li a {
background:none;
border:none;
margin:0 0 1px;
padding:3px 12px 3px 34px;
}
#nav-sub li li a:hover {
background-color:#6a6b6d;
}
#nav-sub li.expanded li.current a {
background-color:#6a6d6d;
}
/* No margin for last child */
#nav-sub li.expanded li.last-child a {
margin:0;
}
\ No newline at end of file
Index: branches/5.0.x/themes/simple/inc/override.css
===================================================================
--- branches/5.0.x/themes/simple/inc/override.css (revision 12608)
+++ branches/5.0.x/themes/simple/inc/override.css (revision 12609)
@@ -1,11 +1,11 @@
-#block-latest .feature { height: auto !important; padding: 10px 0 0 0; background: url(../img/bg-block-latest-featured.png) repeat-x -2px top; }
+#block-latest .feature { height: auto !important; padding: 10px 0 0 0; background: url('../img/bg-block-latest-featured.png') repeat-x -2px top; }
#block-latest .feature div { padding-bottom: 4px; }
#block-latest .feature div div { padding-bottom: 0; }
#block-latest .feature-1 { padding: 0; background: none; }
#block-latest .feature p { float: none; width: auto; margin: 0 0 4px 0; }
#block-latest .feature img { margin: -10px 0 5px 0; background-color: #fff; }
#block-latest .feature-1 img { margin: 0; }
#block-podcasts { position: relative; }
*+ html #content-ter { float: right; margin-right: -180px; }
\ No newline at end of file
Index: branches/5.0.x/themes/simple/inc/ie6.css
===================================================================
--- branches/5.0.x/themes/simple/inc/ie6.css (revision 12608)
+++ branches/5.0.x/themes/simple/inc/ie6.css (revision 12609)
@@ -1,125 +1,117 @@
-/*
- Running MySource Matrix
- Developed by Squiz - http://www.squiz.net
- MySource, MySource Matrix and Squiz.net are registered Trademarks of Squiz Pty Ltd
- Page generated: 18 September 2009 22:51:53
-*/
-
-
/* Disable Border on Hover of Menu Elements */
#wrapper #nav li a div,#wrapper ul#nav-sec li div,#wrapper #site-info li div {
display:none;
}
#wrapper #nav li a:hover,#wrapper ul#nav-sec li a:hover,#wrapper #site-info li a:hover {
text-decoration:underline;
}
/* Add height to containers */
#nav-sec,#nav,#site-info ul,#block-latest .feature,#events .header {
zoom:1;
}
/* Double Margin Fix */
#nav-sec,#nav,#masthead fieldset,#content-tools,ul.event-listing .date {
display:inline;
}
/* Wacko Height */
#masthead#nav-sec {
margin-bottom:11px;
}
#masthead #nav li a {
line-height:30px;
}
#masthead form {
bottom:-1px;
height:32px;
}
.inside #masthead form {
bottom:0;
}
/* You brought this on yourself IE6, you brought it on yourself */
#masthead {
width:944px;
}
#nav {
width:90%;
}
#block-become-involved li {
position:relative;
}
/* Min Height */
#block-become-involved {
height:245px;
position:relative;
padding-top:20px;
}
#content #block-become-involved div.round-top {
position:absolute;
margin:0;
left:-1px;
top:-1px;
width:194px;
}
/* Snap width into place */
#site-info ul {
position:relative;
}
/* Events */
#block-events {
position:relative;
}
.event-listing li {
zoom:1;
}
#events .header ul#select-month {
display:inline;
}
/* Featured Items */
#block-latest .feature {
/* position:static; */
}
/* Fix absolutely positioned elements */
#content {
float:left;
width:100%;
}
/* Transparency */
h1#branding a {
background:none;
filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/logo.png',sizingMethod='crop');
}
#nav-sec li {
background:none;
filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/bg-nav-sec-li.png',sizingMethod='crop');
}
#nav-sec li.first-child {
filter:none;
}
/* Non Collapsing Margin Fix */
#content-main,#content {
margin-bottom:0;
}
#site-info {
margin-top:0;
}
\ No newline at end of file
Index: branches/5.0.x/themes/simple/inc/typography.css
===================================================================
--- branches/5.0.x/themes/simple/inc/typography.css (revision 12608)
+++ branches/5.0.x/themes/simple/inc/typography.css (revision 12609)
@@ -1,161 +1,153 @@
-/*
- Running MySource Matrix
- Developed by Squiz - http://www.squiz.net
- MySource, MySource Matrix and Squiz.net are registered Trademarks of Squiz Pty Ltd
- Page generated: 18 September 2009 23:07:01
-*/
-
-
/* -- TYPE DEFAULTS -- */
body {
color:#2f2d2d;
font:75%/1.3 Arial, Helvetica, sans-serif;
}
/* !MARGINS + PADDING DEFAULTS
-------------------------*/
#content h1,h2,h3,h4,h5 {
margin:25px 0 0;
}
p,
#content ul,
.block ul,
dl,
ol,
blockquote {
margin:.83em 0 1.33em;
}
p img {
margin:0;
}
td {
padding:.2em;
}
/* !HEADINGS
-------------------------*/
#content h1 {
color:#a60d03;
font-size:1.5em;
font-weight:400;
margin:0 0 .77em;
}
h2 {
color:#92af1c;
font-size:1.33em;
font-weight:700;
margin:0 0 .625em;
}
h3 {
color:#c4160b;
font-size:1.25em;
font-weight:700;
}
h4 {
color:#757575;
font-size:1.17em;
font-weight:700;
}
h5 {
color:#000;
font-size:1.08em;
font-weight:700;
margin:0;
}
/* !OTHER ELEMENTS
-------------------------*/
#content-main br.clear {
clear:both;
}
.small {
font-size:.83em;
}
img.align-right {
float:right;
margin:0 0 0 22px;
}
img.align-left {
float:left;
margin:0 22px 0 0;
}
strong {
}
/* !LISTS
-------------------------*/
li {
}
#content ul,ol {
margin-left:0;
padding-left:0;
}
#content li {
-background:url(../img/li.png) no-repeat 0 .31em;
+background:url('../img/li.png') no-repeat 0 .31em;
margin:6px 0;
padding:0 0 0 12px;
}
#content ol {
margin-left:2.5em;
}
#content ol li {
background:none;
padding:0;
}
li ul {
margin:0;
}
/* No List */
ul.plain-list {
margin:0;
padding:0;
list-style:none;
}
/* Definition Links */
dt {
color:#92af1c;
font-weight:400;
font-size:1.08em;
margin:1em 0 .3em;
}
dd {
margin:.3em 0 .5em 60px;
}
/* !LINKS
-------------------------*/
a,a:link,a:visited,a:hover,a:active {
color:#288dbf;
text-decoration:none;
}
a:hover {
text-decoration:underline;
}
a img {
border:none;
}
.breadcrumb a,.breadcrumb a:link,.breadcrumb a:visited,.breadcrumb a:active {
color:#999;
}
\ No newline at end of file
Index: branches/5.0.x/themes/simple/privacy.tpl
===================================================================
--- branches/5.0.x/themes/simple/privacy.tpl (nonexistent)
+++ branches/5.0.x/themes/simple/privacy.tpl (revision 12609)
@@ -0,0 +1,28 @@
+<!--##
+<NAME>Privacy Policy</NAME>
+<DESC></DESC>
+<SECTION></SECTION>
+##-->
+
+<!--## DEFINE MAIN CONTENT ELEMENT ##-->
+<inp2:m_DefineElement name="content">
+
+ <div class="movable-element">
+
+ <div id="block-latest" class="block">
+ <div class="round-top"></div>
+ <div class="content">
+ <h1 class="movable-header"><inp2:st_PageInfo type="title"/></h1>
+ <inp2:st_ContentBlock num="1"/>
+ </div>
+ <div class="round-bottom"></div>
+ </div>
+
+ </div>
+
+</inp2:m_DefineElement>
+<!--## /DEFINE MAIN CONTENT ELEMENT ##-->
+
+<!--## INCLUDE MAIN DESIGN TEMPLATE ##-->
+<inp2:m_include template="designs/default_design.des"/>
+<!--## /INCLUDE MAIN DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/5.0.x/themes/simple/privacy.tpl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/5.0.x/themes/simple/designs/default_design_inner.des.tpl
===================================================================
--- branches/5.0.x/themes/simple/designs/default_design_inner.des.tpl (nonexistent)
+++ branches/5.0.x/themes/simple/designs/default_design_inner.des.tpl (revision 12609)
@@ -0,0 +1,91 @@
+<inp2:m_CheckSSL/>
+<inp2:m_Include template="elements/side_boxes.elm" strip_nl="1"/> <!--## includes system elements ##-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+ <title>
+ <inp2:st_PageInfo type="title"/> (<inp2:m_GetConfig name="Site_Name"/>)
+ </title>
+
+
+ <inp2:m_Include template="elements/html_head.elm" />
+</head>
+
+<body>
+ <inp2:st_EditPage mode="start"/><!--## System tag please do not remove ##-->
+
+ <!-- Wrapper -->
+ <div id="wrapper">
+
+ <!-- Accessibility Navigation -->
+ <ol id="nav-accessibility">
+ <li><a href="#nav">Skip to navigation</a></li>
+ <li><a href="#content">Skip to content</a></li>
+ </ol>
+ <!-- /Accessibility Navigation -->
+
+ <!-- Masthead -->
+ <div id="masthead">
+
+ <!-- Branding -->
+ <h1 id="branding">
+ <a href="<inp2:m_Link t="index" />" title="<inp2:m_GetConfig name="Site_Name"/>"><inp2:m_GetConfig name="Site_Name"/></a>
+ </h1>
+ <!-- /Branding -->
+
+ <!-- Navigation -->
+ <inp2:m_include template="elements/navigation_menu.elm" />
+ <!-- /Navigation -->
+
+ <!-- Search -->
+ <inp2:m_include template="elements/search.elm" />
+ <!-- /Search -->
+
+ </div>
+ <!-- /Masthead -->
+
+ <!-- Breadcrumb -->
+ <inp2:m_Include template="elements/navigation_bar.elm" />
+ <!-- /Breadcrumb -->
+
+ <!-- Content Tools -->
+ <inp2:m_Include template="elements/content_tools.elm" />
+ <!-- /Content Tools -->
+
+ <!-- Content -->
+ <div id="content">
+
+ <div id="content-sec">
+
+ <div class="movable-area">
+ <inp2:m_RenderElement name="left_sidebar" default_element="default_left_sidebar" /> <!--## defined in each data template or default one used ##-->
+ </div>
+
+ </div>
+
+ <!-- Main Content -->
+ <div id="content-main" class="inner">
+
+ <div class="movable-area">
+ <inp2:m_RenderElement name="content"/>
+ </div>
+
+ </div>
+ <!-- /Main Content -->
+
+ </div><!-- /Content -->
+
+ <inp2:m_Include template="elements/footer.elm" />
+
+ </div><!-- /Wrapper -->
+
+ <inp2:st_EditPage mode="end"/> <!--## /System tag please do not remove ##-->
+
+ <inp2:m_Include template="elements/tracking.elm" />
+
+</body>
+</html>
\ No newline at end of file
Property changes on: branches/5.0.x/themes/simple/designs/default_design_inner.des.tpl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/5.0.x/themes/simple/designs/default_design.des.tpl
===================================================================
--- branches/5.0.x/themes/simple/designs/default_design.des.tpl (revision 12608)
+++ branches/5.0.x/themes/simple/designs/default_design.des.tpl (revision 12609)
@@ -1,132 +1,99 @@
<inp2:m_CheckSSL/>
-<inp2:m_include template="elements/side_boxes.elm" strip_nl="1"/> <!--## includes system elements ##-->
+<inp2:m_Include template="elements/side_boxes.elm" strip_nl="1"/> <!--## includes system elements ##-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<title>
<inp2:st_PageInfo type="title"/> (<inp2:m_GetConfig name="Site_Name"/>)
</title>
- <inp2:m_Include t="elements/html_head.elm" />
+ <inp2:m_Include template="elements/html_head.elm" />
</head>
<body>
<inp2:st_EditPage mode="start"/><!--## System tag please do not remove ##-->
<!-- Wrapper -->
<div id="wrapper">
<!-- Accessibility Navigation -->
<ol id="nav-accessibility">
<li><a href="#nav">Skip to navigation</a></li>
<li><a href="#content">Skip to content</a></li>
- <li><a href="#content-sub">Skip to Secondary Content</a></li>
</ol>
<!-- /Accessibility Navigation -->
<!-- Masthead -->
<div id="masthead">
<!-- Branding -->
<h1 id="branding">
<a href="<inp2:m_Link t="index" />" title="<inp2:m_GetConfig name="Site_Name"/>"><inp2:m_GetConfig name="Site_Name"/></a>
</h1>
<!-- /Branding -->
<!-- Navigation -->
- <inp2:m_include t="elements/navigation_menu.elm" />
+ <inp2:m_include template="elements/navigation_menu.elm" />
<!-- /Navigation -->
<!-- Search -->
- <inp2:m_include t="elements/search.elm" />
+ <inp2:m_include template="elements/search.elm" />
<!-- /Search -->
</div>
<!-- /Masthead -->
<!-- Breadcrumb -->
- <inp2:m_include t="elements/navigation_bar.elm" />
+ <inp2:m_Include template="elements/navigation_bar.elm" />
<!-- /Breadcrumb -->
<!-- Content Tools -->
- <inp2:m_include t="elements/content_tools.elm" />
+ <inp2:m_Include template="elements/content_tools.elm" />
<!-- /Content Tools -->
<!-- Content -->
<div id="content">
-
<div id="content-sec">
- <inp2:m_DefineElement name="default_left_sidebar" no_editing="1">
- <div class="movable-area">
- <div class="movable-element">
- <inp2:m_RenderElement name="elements/side_boxes/subscribe.elm" design="side_box"/>
- </div>
- </div>
- </inp2:m_DefineElement>
- <inp2:m_RenderElement name="left_sidebar" default_element="default_left_sidebar"/>
- </div>
+ <div class="movable-area">
+ <inp2:m_RenderElement name="left_sidebar" default_element="default_left_sidebar" /> <!--## defined in each data template or default one used ##-->
+ </div>
+ </div>
<!-- Main Content -->
<div id="content-main">
- <div id="block-latest" class="block">
- <div class="round-top"></div>
- <div class="content">
- <inp2:st_ContentBlock num="1"/>
- </div>
- <div class="round-bottom"></div>
+ <div class="movable-area">
+ <inp2:m_RenderElement name="content"/>
</div>
</div>
<!-- /Main Content -->
-
<div id="content-ter">
- <div class="movable-area">
- <div class="movable-element">
-
- <div class="block" id="side-box-plain">
-
- <div class="round-top"></div>
- <h3>Latest <strong>Podcasts</strong></h3>
- <div>
- <ul>
- <li><a href="<inp2:m_Link t="index" />">Young Entrepreneurs in China and Australia: Be inspired by stories of success</a></li>
-
- </ul>
- </div>
-
- <div class="content">
- <p class="link-rss"><a href="http://harangue.lecture.unimelb.edu.au/lectopia/podcast.lasso?ut=1633&feed=1&key=2f346fec58ee22a6d2662a6a3f6e8ded" title="Podcast RSS">Subscribe to RSS</a></p>
- <p class="link"><a href="http://www.asialink.unimelb.edu.au/subscribe">How to subscribe ></a></p>
- </div>
-
- <div class="round-bottom"></div>
-
- </div>
-
-
- </div>
+ <div class="movable-area">
+ <inp2:m_Include template="elements/side_boxes/news.elm" />
</div>
+
</div>
</div><!-- /Content -->
- <inp2:m_include t="elements/footer.elm" />
+ <inp2:m_Include template="elements/footer.elm" />
</div><!-- /Wrapper -->
<inp2:st_EditPage mode="end"/> <!--## /System tag please do not remove ##-->
- <inp2:m_include t="elements/tracking.elm" />
+ <inp2:m_Include template="elements/tracking.elm" />
+
</body>
</html>
\ No newline at end of file
Index: branches/5.0.x/themes/simple/designs/general.tpl
===================================================================
--- branches/5.0.x/themes/simple/designs/general.tpl (revision 12608)
+++ branches/5.0.x/themes/simple/designs/general.tpl (revision 12609)
@@ -1,15 +1,36 @@
<!--##
<NAME>General - Section Template</NAME>
<DESC>General</DESC>
<SECTION>Platform</SECTION>
##-->
+<!--## DEFINE LEFT SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="left_sidebar">
-<div class="movable-area">
+
+ <div class="movable-element">
+ <inp2:m_Include template="elements/side_boxes/sub_menu.elm"/>
+ </div>
+
+</inp2:m_DefineElement>
+<!--## /DEFINE LEFT SIDE-BAR ELEMENT ##-->
+
+<!--## DEFINE MAIN CONTENT ELEMENT ##-->
+<inp2:m_DefineElement name="content">
+
<div class="movable-element">
- <inp2:m_RenderElement name="elements/side_boxes/sub_navigation.elm"/>
+ <div id="block-latest" class="block">
+ <div class="round-top"></div>
+ <div class="content">
+ <h1 class="movable-header"><inp2:st_PageInfo type="title"/></h1>
+ <inp2:st_ContentBlock num="1"/>
+ </div>
+ <div class="round-bottom"></div>
+ </div>
</div>
-</div>
+
</inp2:m_DefineElement>
+<!--## /DEFINE MAIN CONTENT ELEMENT ##-->
-<inp2:m_include template="designs/default_design.des"/>
\ No newline at end of file
+<!--## INCLUDE MAIN DESIGN TEMPLATE ##-->
+<inp2:m_include template="designs/default_design_inner.des"/>
+<!--## /INCLUDE MAIN DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/5.0.x/themes/simple/elements/html_head.elm.tpl
===================================================================
--- branches/5.0.x/themes/simple/elements/html_head.elm.tpl (revision 12608)
+++ branches/5.0.x/themes/simple/elements/html_head.elm.tpl (revision 12609)
@@ -1,23 +1,19 @@
-
<meta http-equiv="content-type" content="text/html; charset=<inp2:lang.current_Field name="Charset"/>" />
<!-- CSS -->
<link rel="stylesheet" type="text/css" href="<inp2:m_TemplatesBase />inc/screen.css" media="screen" />
<link rel="stylesheet" type="text/css" href="<inp2:m_TemplatesBase />inc/print.css" media="print" />
<link rel="stylesheet" type="text/css" href="<inp2:m_TemplatesBase />inc/override.css" media="all" />
<!--[if IE 6]>
<link rel="stylesheet" type="text/css" href="<inp2:m_TemplatesBase module="In-Portal"/>inc/ie6.css" media="screen" />
<![endif]-->
<!-- JS -->
<inp2:st_EditingScripts/>
-<inp2:m_ifnot check="m_GetConst" name="EDITING_MODE">
- <!--<script type="text/javascript" src="<inp2:m_TemplatesBase />inc/jquery/jquery.js"></script>-->
- <script type="text/javascript" src="<inp2:m_TemplatesBase />inc/jquery/jquery.1.3.2.js"></script>
-</inp2:m_ifnot>
+<inp2:m_ifnot check="m_GetConst" name="EDITING_MODE"> <!--## EXCLUDE JS WHEN IN ADMIN ##-->
+ <script type="text/javascript" src="<inp2:m_TemplatesBase />inc/jquery/jquery.pack.js"></script>
+</inp2:m_ifnot> <!--## EXCLUDE JS WHEN IN ADMIN ##-->
<script type="text/javascript" src="<inp2:m_TemplatesBase />inc/jquery/jcookie.js"></script>
-<!--<script type="text/javascript" src="<inp2:m_TemplatesBase />inc/jquery/jquery.validate.js"></script>-->
-
-<script type="text/javascript" src="<inp2:m_TemplatesBase />inc/general.js"></script>
+<script type="text/javascript" src="<inp2:m_TemplatesBase />inc/general.js"></script>
\ No newline at end of file
Index: branches/5.0.x/themes/simple/elements/search.elm.tpl
===================================================================
--- branches/5.0.x/themes/simple/elements/search.elm.tpl (revision 12608)
+++ branches/5.0.x/themes/simple/elements/search.elm.tpl (revision 12609)
@@ -1,8 +1,8 @@
-<form method="post" action="<inp2:m_Link template="search-results" pass_category="1"/>">
+<form method="post" action="<inp2:m_Link template="search-results" m_cat_id="0"/>">
<fieldset id="site-search">
<inp2:m_GetFormHiddens template="search-results" />
<input type="hidden" name="mode" value="results" />
- <input type="text" name="keywords" value="" size="5" class="sq-form-field" id="queries_keywords_query" onfocus="if (this.value == '') { this.value = ''; }" onblur="if (this.value == '') { this.value=''; }" />
- <span class="submit"><input type="submit" value="Search" /></span>
+ <input type="text" name="keywords" value="" size="5" class="sq-form-field" id="queries_keywords_query" onfocus="if (this.value == '') { this.value = ''; }" onblur="if (this.value == '') { this.value=''; }" />
+ <span class="submit"><input type="submit" value="<inp2:m_Phrase label="lu_search" no_editing="1"/>" /></span>
</fieldset>
</form>
\ No newline at end of file
Index: branches/5.0.x/themes/simple/elements/content_tools.elm.tpl
===================================================================
--- branches/5.0.x/themes/simple/elements/content_tools.elm.tpl (revision 12608)
+++ branches/5.0.x/themes/simple/elements/content_tools.elm.tpl (revision 12609)
@@ -1,3 +1,3 @@
<ul id="content-tools">
- <li id="send-to-friend"><a href="<inp2:m_Link t="send_to_friend" />" title="Send to a friend">Send to a friend</a></li>
+ <li id="send-to-friend"><a href="<inp2:m_Link template="recommend" m_cat_id="0"/>" title="<inp2:m_Phrase label="lu_title_RecommendSite" no_editing="1"/>"><inp2:m_Phrase label="lu_title_RecommendSite" no_editing="1"/></a></li>
</ul>
Index: branches/5.0.x/themes/simple/elements/side_boxes/news.elm.tpl
===================================================================
--- branches/5.0.x/themes/simple/elements/side_boxes/news.elm.tpl (nonexistent)
+++ branches/5.0.x/themes/simple/elements/side_boxes/news.elm.tpl (revision 12609)
@@ -0,0 +1,17 @@
+<div class="movable-element">
+ <div class="block" id="side-box-plain">
+ <div class="round-top"></div>
+ <h3 class="movable-header">Latest <strong>News</strong></h3>
+ <div>
+ <ul>
+ <inp2:st_ContentBlock num="2"/>
+ </ul>
+ </div>
+ <!--##
+ <div class="content">
+ <p class="link"><a href="<inp2:m_Link t="subscribe" />">How to subscribe ></a></p>
+ </div>
+ ##-->
+ <div class="round-bottom"></div>
+ </div>
+</div>
\ No newline at end of file
Property changes on: branches/5.0.x/themes/simple/elements/side_boxes/news.elm.tpl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/5.0.x/themes/simple/elements/side_boxes/sub_menu.elm.tpl
===================================================================
--- branches/5.0.x/themes/simple/elements/side_boxes/sub_menu.elm.tpl (revision 12608)
+++ branches/5.0.x/themes/simple/elements/side_boxes/sub_menu.elm.tpl (revision 12609)
@@ -1,11 +1,11 @@
-<inp2:m_DefineElement name="nav_menu_element">
+<inp2:m_DefineElement name="nav_menu_element" no_editing="1">
<li class="<inp2:m_if check='m_Param' name='active'>expanded current</inp2:m_if><inp2:m_if check='m_Param' name='is_first'> first-child<inp2:m_elseif check='m_Param' name='is_last'/> last-child</inp2:m_if>">
<a href="<inp2:m_if check='m_Param' name='external_url'><inp2:m_Param name='external_url'/><inp2:m_else/><inp2:m_Link template='$template' m_cat_id='$cat_id' m_cat_page='1'/></inp2:m_if>" title="<inp2:m_Param name="title"/>"><inp2:m_Param name="title"/></a>
</li>
</inp2:m_DefineElement>
<div id="nav-sub">
<ul>
<inp2:st_CachedMenu render_as="nav_menu_element" category_id="parent" />
</ul>
-</div>
+</div>
\ No newline at end of file
Index: branches/5.0.x/themes/simple/elements/side_boxes/subscribe.elm.tpl
===================================================================
--- branches/5.0.x/themes/simple/elements/side_boxes/subscribe.elm.tpl (revision 12608)
+++ branches/5.0.x/themes/simple/elements/side_boxes/subscribe.elm.tpl (revision 12609)
@@ -1,26 +1,26 @@
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_MailingList"/>
</inp2:m_Capture>
<script type="text/javascript">
/*$(document).ready(function(){
$("#subscribeform").validate();
});*/
</script>
<form method="post" action="<inp2:m_FormAction />" id="subscribeform">
<div>
<input type="hidden" name="subscribe_template" value="mailing_list/subscribe"/>
<input type="hidden" name="unsubscribe_template" value="mailing_list/unsubscribe"/>
<fieldset>
- <label for="subscribe-email">Enter email adress below</label>
+ <label for="subscribe-email"><inp2:m_Phrase label="lu_EnterEmailToSubscribe"/></label>
<inp2:m_if check="u_HasError" field="any">
<span id="errormsg"><inp2:u_Error field="SubscribeEmail"/></span><br />
</inp2:m_if>
<span class="emailfield">
<input type="text" name="subscriber_email" class="required email" id="subscribe-email" />
</span>
- <span class="submit"><input type="submit" name="events[u][OnSubscribeQuery]" value="Subscribe" /></span>
+ <span class="submit"><input type="submit" name="events[u][OnSubscribeQuery]" value="<inp2:m_Phrase label='lu_btn_Subscribe' no_editing='1'/>" /></span>
</fieldset>
</div>
</form>
Index: branches/5.0.x/themes/simple/elements/footer.elm.tpl
===================================================================
--- branches/5.0.x/themes/simple/elements/footer.elm.tpl (revision 12608)
+++ branches/5.0.x/themes/simple/elements/footer.elm.tpl (revision 12609)
@@ -1,9 +1,9 @@
<div id="site-info">
<ul>
- <li class="first-child"><a href="<inp2:m_Link t="index" />"><inp2:m_Phrase name="lu_Home"/></a></li>
- <li><a href="<inp2:m_Link t="sitemap" />"><inp2:m_Phrase name="lu_SiteMap"/></a></li>
- <li><a href="<inp2:m_Link t="terms" />"><inp2:m_Phrase name="lu_title_TermsAndConditions"/></a></li>
- <li><a href="<inp2:m_Link t="privacy" />"><inp2:m_Phrase name="lu_PrivacyPolicy"/></a></li>
- <li class="last-child"><a href="#masthead">Back to top</a></li>
+ <li class="first-child"><a href="<inp2:m_Link template="index" m_cat_id="0"/>"><inp2:m_Phrase name="lu_Home"/></a></li>
+ <li><a href="<inp2:m_Link template="terms" m_cat_id="0"/>"><inp2:m_Phrase name="lu_title_TermsAndConditions"/></a></li>
+ <li><a href="<inp2:m_Link template="privacy" m_cat_id="0"/>"><inp2:m_Phrase name="lu_title_PrivacyPolicy"/></a></li>
+ <li><a href="<inp2:m_Link template="sitemap" m_cat_id="0"/>"><inp2:m_Phrase name="lu_title_Sitemap"/></a></li>
+ <li class="last-child"><a href="#masthead"><inp2:m_Phrase name="lu_title_BackToTop"/></a></li>
</ul>
</div>
\ No newline at end of file
Index: branches/5.0.x/themes/simple/elements/navigation_menu.elm.tpl
===================================================================
--- branches/5.0.x/themes/simple/elements/navigation_menu.elm.tpl (revision 12608)
+++ branches/5.0.x/themes/simple/elements/navigation_menu.elm.tpl (revision 12609)
@@ -1,24 +1,24 @@
<inp2:m_DefineElement name="menu_element" no_editing="1">
<li>
<a href="<inp2:m_if check='m_Param' name='external_url'><inp2:m_Param name='external_url'/><inp2:m_else/><inp2:m_Link template='$template' m_cat_id='$cat_id' m_cat_page='1'/></inp2:m_if>" title="<inp2:m_Param name="title"/>"><inp2:m_Param name="title"/></a>
<inp2:m_if check="m_Param" name="has_sub_menu">
<ul>
<inp2:st_CachedMenu render_as="sub_menu_element" category_id="$cat_id"/>
</ul>
</inp2:m_if>
</li>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="sub_menu_element" no_editing="1">
<li>
<a href="<inp2:m_if check='m_Param' name='external_url'><inp2:m_Param name='external_url'/><inp2:m_else/><inp2:m_Link template='$template' m_cat_id='$cat_id' m_cat_page='1'/></inp2:m_if>" title="<inp2:m_Param name="title"/>"><inp2:m_Param name="title"/></a>
</li>
</inp2:m_DefineElement>
<ul id="nav">
<li>
- <a href="<inp2:m_Link template='index' m_cat_id='0' m_cat_page='1'/>" title="<inp2:m_RootCategoryName no_editing='1'/>"><inp2:m_RootCategoryName/></a>
+ <a href="<inp2:m_Link template='index' m_cat_id='0' m_cat_page='1'/>" title="<inp2:m_RootCategoryName no_editing='1'/>"><inp2:m_RootCategoryName no_editing='1'/></a>
</li>
<inp2:st_CachedMenu render_as="menu_element" category_id="1"/>
</ul>
\ No newline at end of file
Index: branches/5.0.x/themes/simple/elements/side_boxes.elm.tpl
===================================================================
--- branches/5.0.x/themes/simple/elements/side_boxes.elm.tpl (revision 12608)
+++ branches/5.0.x/themes/simple/elements/side_boxes.elm.tpl (revision 12609)
@@ -1,9 +1,19 @@
+<!--## DESIGN FOR SIDE-BOX ELEMENTS ##-->
<inp2:m_DefineElement name="side_box">
<div class="block" id="side-box">
<h3 class="movable-header"><inp2:m_param name="header"/></h3>
<div class="content">
<inp2:m_param name="content"/>
</div>
<div class="round-bottom"></div>
</div>
-</inp2:m_DefineElement>
\ No newline at end of file
+</inp2:m_DefineElement>
+<!--## /DESIGN FOR SIDE-BOX ELEMENTS ##-->
+
+<!--## DEFAULT SIDE-BOX ELEMENT ##-->
+<inp2:m_DefineElement name="default_left_sidebar" no_editing="1">
+ <div class="movable-element">
+ <inp2:m_RenderElement name="elements/side_boxes/subscribe.elm" design="side_box" />
+ </div>
+</inp2:m_DefineElement>
+<!--## /DEFAULT SIDE-BOX ELEMENT ##-->
\ No newline at end of file
Event Timeline
Log In to Comment