From 39028d618403e40741009b070e4c969d499cf021 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Wed, 20 Mar 2013 20:46:43 +0000
Subject: Make the channels profile tab actually do something.

---
 view/tpl/profile_edit.tpl         | 9 +++++++++
 view/tpl/smarty3/profile_edit.tpl | 9 +++++++++
 2 files changed, 18 insertions(+)

(limited to 'view')

diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index a498f3a65..6ff4cf8c1 100644
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -206,6 +206,15 @@ $lbl_social
 </div>
 <div id="contact-jot-end"></div>
 
+<div id="channels-jot-wrapper" >
+<p id="channels-jot-desc" >
+$lbl_channels
+</p>
+
+<textarea rows="10" cols="72" id="channels-jot-text" name="channels" >$channels</textarea>
+
+</div>
+<div id="channels-jot-end"></div>
 
 <div class="profile-edit-submit-wrapper" >
 <input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
diff --git a/view/tpl/smarty3/profile_edit.tpl b/view/tpl/smarty3/profile_edit.tpl
index 3a2652a68..864599244 100644
--- a/view/tpl/smarty3/profile_edit.tpl
+++ b/view/tpl/smarty3/profile_edit.tpl
@@ -211,6 +211,15 @@
 </div>
 <div id="contact-jot-end"></div>
 
+<div id="channels-jot-wrapper" >
+<p id="channels-jot-desc" >
+{{$lbl_channels}}
+</p>
+
+<textarea rows="10" cols="72" id="channels-jot-text" name="channels" >{{$channels}}</textarea>
+
+</div>
+<div id="channels-jot-end"></div>
 
 <div class="profile-edit-submit-wrapper" >
 <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-- 
cgit v1.2.3


From f49dcc0a0c6694e46dc445c81d69f0a069ac2c09 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Wed, 20 Mar 2013 22:57:08 +0000
Subject: Use load_pconfig in style.php

---
 view/theme/redbasic/php/style.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 6e8bd8a18..e011d6185 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -2,7 +2,8 @@
   // This needs changing now, if we're going for global settings.  Admin settings have been removed in preparation, You *should* just be able to remove all 
   // the get_config bits, though this is untested.  
   // We also need to eventually.  Use the page owners settings for everybody - get_pconfig(page_owner()) or whatever that would look like.
-  
+    load_pconfig(local_user(),'redbasic');
+
     $line_height = false;
     $redbasic_font_size = false;
     $resolution = false;
-- 
cgit v1.2.3


From 676d35b173122573085cd414602f9321aba879ec Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Thu, 21 Mar 2013 04:14:19 +0000
Subject: Add register link to nav.

---
 view/tpl/nav.tpl         | 3 +++
 view/tpl/smarty3/nav.tpl | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'view')

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 7b11c3794..fde40832c 100644
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -58,6 +58,9 @@
 		</li>
 	{{ endif }}
 
+   {{ if $nav.register }}<li id="nav-register-link" class="nav-menu $nav.login.2"><a href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a><li>{{ endif }}
+
+
 	{{ if $nav.messages }}
 		<li id="nav-mail-link" class="nav-menu $sel.messages">
 			<a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
diff --git a/view/tpl/smarty3/nav.tpl b/view/tpl/smarty3/nav.tpl
index 3774333bb..6faf26176 100644
--- a/view/tpl/smarty3/nav.tpl
+++ b/view/tpl/smarty3/nav.tpl
@@ -63,6 +63,9 @@
 		</li>
 	{{/if}}
 
+   {{if $nav.register}}<li id="nav-register-link" class="nav-menu {{$nav.login.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}}
+
+
 	{{if $nav.messages}}
 		<li id="nav-mail-link" class="nav-menu {{$sel.messages}}">
 			<a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
-- 
cgit v1.2.3


From 06c5d0fcc2b5a2a5babe0ef3b2fcaadf4cefbc31 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Thu, 21 Mar 2013 04:18:03 +0000
Subject: Typo

---
 view/tpl/nav.tpl         | 2 +-
 view/tpl/smarty3/nav.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index fde40832c..e97064d5f 100644
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -58,7 +58,7 @@
 		</li>
 	{{ endif }}
 
-   {{ if $nav.register }}<li id="nav-register-link" class="nav-menu $nav.login.2"><a href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a><li>{{ endif }}
+   {{ if $nav.register }}<li id="nav-register-link" class="nav-menu $nav.register.2"><a href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a><li>{{ endif }}
 
 
 	{{ if $nav.messages }}
diff --git a/view/tpl/smarty3/nav.tpl b/view/tpl/smarty3/nav.tpl
index 6faf26176..beddc9109 100644
--- a/view/tpl/smarty3/nav.tpl
+++ b/view/tpl/smarty3/nav.tpl
@@ -63,7 +63,7 @@
 		</li>
 	{{/if}}
 
-   {{if $nav.register}}<li id="nav-register-link" class="nav-menu {{$nav.login.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}}
+   {{if $nav.register}}<li id="nav-register-link" class="nav-menu {{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}}
 
 
 	{{if $nav.messages}}
-- 
cgit v1.2.3