From 4e9bd8b8f0a2629cf1ad7c7274369e795852a8ab Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Fri, 10 Oct 2014 15:52:56 +0200
Subject: This is a fix to not interfere the ongoing adding of
 .generic-content-wrapper with the ongoing styling of redbasic theme. adding
 of .generic-content-wrapper is needed and useful for derivative themes but it
 should not contain any styling information for redbasic theme. therefor i
 added .generic-content-wrapper-styled as a quickfix for spots where redbasic
 is not finished yet. Sidenote: please avoid opening a div in one *.tpl and
 close it in another or (even worse) open a div in a *.tpl and close it in an
 already templatified mod/*.php. This will really make the code and templates
 very, very confusing.

---
 view/tpl/channels.tpl               | 2 +-
 view/tpl/cloud_actionspanel.tpl     | 2 ++
 view/tpl/cloud_directory.tpl        | 3 ++-
 view/tpl/connections.tpl            | 2 +-
 view/tpl/directory_header.tpl       | 2 +-
 view/tpl/event_form.tpl             | 2 +-
 view/tpl/events-js.tpl              | 2 +-
 view/tpl/menulist.tpl               | 2 +-
 view/tpl/notifications.tpl          | 2 +-
 view/tpl/photo_view.tpl             | 2 +-
 view/tpl/photos_upload.tpl          | 5 +++--
 view/tpl/profile_entry.tpl          | 2 ++
 view/tpl/profile_listing_header.tpl | 3 ++-
 13 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl
index 5f00b1535..0dec68a53 100755
--- a/view/tpl/channels.tpl
+++ b/view/tpl/channels.tpl
@@ -1,4 +1,4 @@
-<div class="generic-content-wrapper">
+<div class="generic-content-wrapper-styled">
 <h3>{{$header}}</h3>
 
 {{if $links}}
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index 3d4867f7e..00f243c1e 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -1,3 +1,5 @@
+<div class="generic-content-wrapper-styled">
+
 <table>
 	<tr>
 		<td><strong>{{$folder_header}}</strong>&nbsp;&nbsp;&nbsp;</td>
diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl
index 40599aad3..639a6bf61 100644
--- a/view/tpl/cloud_directory.tpl
+++ b/view/tpl/cloud_directory.tpl
@@ -1,4 +1,4 @@
-<div class="generic-content-wrapper">
+<div class="generic-content-wrapper-styled">
 <h1>{{$header}}</h1>
 <table id="cloud-index">
 	<tr>
@@ -42,3 +42,4 @@
 {{if $quota.limit || $quota.used}}
 	<p><strong>{{$total}}</strong> {{$quota.desc}}</p>
 {{/if}}
+</div>
diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl
index 534a198cd..8e5266978 100755
--- a/view/tpl/connections.tpl
+++ b/view/tpl/connections.tpl
@@ -1,4 +1,4 @@
-<div class="generic-content-wrapper">
+<div class="generic-content-wrapper-styled">
 
 <h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1>
 
diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl
index f7bbe9184..477df8a63 100755
--- a/view/tpl/directory_header.tpl
+++ b/view/tpl/directory_header.tpl
@@ -1,4 +1,4 @@
-<div class="generic-content-wrapper">
+<div class="generic-content-wrapper-styled">
 <h1>{{$dirlbl}}</h1>
 
 {{if $search}}
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index a5ba69bc8..2a580e3b8 100755
--- a/view/tpl/event_form.tpl
+++ b/view/tpl/event_form.tpl
@@ -1,4 +1,4 @@
-<div class="generic-content-wrapper">
+<div class="generic-content-wrapper-styled">
 
 <h3>{{$title}}</h3>
 
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index 342afb36f..69a248512 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -1,5 +1,5 @@
 {{$tabs}}
-<div class="generic-content-wrapper"> 
+<div class="generic-content-wrapper-styled">
 <h2>{{$title}}</h2>
 
 <div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div>
diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl
index 083b56805..2feb75d90 100644
--- a/view/tpl/menulist.tpl
+++ b/view/tpl/menulist.tpl
@@ -1,4 +1,4 @@
-<div class="generic-content-wrapper">
+<div class="generic-content-wrapper-styled">
 
 <h1>{{$title}}</h1>
 
diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl
index 076b4e763..0b24da7c3 100755
--- a/view/tpl/notifications.tpl
+++ b/view/tpl/notifications.tpl
@@ -1,4 +1,4 @@
-<div class="generic-content-wrapper">
+<div class="generic-content-wrapper-styled">
 
 <h1>{{$notif_header}}</h1>
 
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 08d7e79f0..f895b3129 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -1,5 +1,5 @@
 <div id="live-photos"></div>
-<div class="generic-content-wrapper">
+<div class="generic-content-wrapper-styled">
 <h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
 
 <div id="photo-edit-link-wrap">
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index b369e1d25..81d7b6dc0 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -4,7 +4,8 @@
 	<div class="clear"></div>
 </div>
 
-<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" class="generic-content-wrapper">
+<div class="generic-content-wrapper-styled">
+<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
 	<input type="hidden" id="photos-upload-source" name="source" value="photos" />
 	<div id="photos-upload-new-wrapper" >
 		<div id="photos-upload-newalbum-div">
@@ -40,4 +41,4 @@
 
 	<div class="photos-upload-end" ></div>
 </form>
-
+</div>
diff --git a/view/tpl/profile_entry.tpl b/view/tpl/profile_entry.tpl
index 709730a47..ab81a7fbc 100755
--- a/view/tpl/profile_entry.tpl
+++ b/view/tpl/profile_entry.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <div class="profile-listing" >
 <div class="profile-listing-photo-wrapper" >
 <a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a>
@@ -7,3 +8,4 @@
 <div class="profile-listing-visible">{{$visible}}</div>
 </div>
 <div class="profile-listing-end"></div>
+</div>
diff --git a/view/tpl/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl
index 0b3505f34..09d00f982 100755
--- a/view/tpl/profile_listing_header.tpl
+++ b/view/tpl/profile_listing_header.tpl
@@ -1,4 +1,4 @@
-<div class="generic-content-wrapper">
+<div class="generic-content-wrapper-styled">
 <h1>{{$header}}</h1>
 <p id="profile-listing-desc" class="btn btn-default" >
 <a href="profile_photo" >{{$chg_photo}}</a>
@@ -8,3 +8,4 @@
 </p>
 <p id="profile-listing-new-link-wrapper" class="btn btn-default" >
 <a href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" >{{$cr_new}}</a>
+</div>
-- 
cgit v1.2.3