Merge https://github.com/friendica/red into zpull

15 files changed, 45 insertions, 33 deletions

diff --git a/view/theme/redbasic/css/dark.css b/view/theme/redbasic/css/dark.css
index 74e109f95..43912be69 100644
--- a/view/theme/redbasic/css/dark.css
+++ b/view/theme/redbasic/css/dark.css
@@ -167,4 +167,16 @@ ul.menu-popup .menu-sep {
 .my-comment-photo {
   border-radius: 5px;
   box-shadow: 4px 4px 3px #000;
-}
\ No newline at end of file
+}
+
+
+div#pagelist-content-wrapper {
+width: 80%;
+background: #111;
+margin-left: auto;
+margin-right: auto;
+}
+
+div.page-list-item {
+margin: 20px;
+}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 762c35a18..9caa9145a 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -3893,4 +3893,16 @@ width: 200px;
 	float: left;
 	margin-right: 25px;
 }
-*/
\ No newline at end of file
+*/
+
+
+div#pagelist-content-wrapper {
+width: 80%;
+background: #fff;
+margin-left: auto;
+margin-right: auto;
+}
+
+div.page-list-item {
+margin: 20px;
+}
diff --git a/view/theme/redbasic/img/bg.png b/view/theme/redbasic/img/bg.png
deleted file mode 100644
index eae49e037..000000000
--- a/view/theme/redbasic/img/bg.png
+++ /dev/null
diff --git a/view/theme/redbasic/img/events.png b/view/theme/redbasic/img/events.png
deleted file mode 100644
index 96dd86899..000000000
--- a/view/theme/redbasic/img/events.png
+++ /dev/null
diff --git a/view/theme/redbasic/img/head.jpg b/view/theme/redbasic/img/head.jpg
deleted file mode 100644
index 6210b76be..000000000
--- a/view/theme/redbasic/img/head.jpg
+++ /dev/null
diff --git a/view/theme/redbasic/img/home.png b/view/theme/redbasic/img/home.png
deleted file mode 100644
index d1ba7b3f3..000000000
--- a/view/theme/redbasic/img/home.png
+++ /dev/null
diff --git a/view/theme/redbasic/img/introductions.png b/view/theme/redbasic/img/introductions.png
deleted file mode 100644
index 9e0498227..000000000
--- a/view/theme/redbasic/img/introductions.png
+++ /dev/null
diff --git a/view/theme/redbasic/img/lock.cur b/view/theme/redbasic/img/lock.cur
deleted file mode 100644
index 892c5e851..000000000
--- a/view/theme/redbasic/img/lock.cur
+++ /dev/null
diff --git a/view/theme/redbasic/img/message.png b/view/theme/redbasic/img/message.png
deleted file mode 100644
index f3fea75ee..000000000
--- a/view/theme/redbasic/img/message.png
+++ /dev/null
diff --git a/view/theme/redbasic/img/network.png b/view/theme/redbasic/img/network.png
deleted file mode 100644
index f3e45c3ec..000000000
--- a/view/theme/redbasic/img/network.png
+++ /dev/null
diff --git a/view/theme/redbasic/img/settings.png b/view/theme/redbasic/img/settings.png
deleted file mode 100644
index a935b225e..000000000
--- a/view/theme/redbasic/img/settings.png
+++ /dev/null
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index 33ab84df7..d2016e41c 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -1,14 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script type="text/javascript" charset="utf-8">
-  $(document).ready(function(){
-    $("a[rel^='prettyPhoto']").prettyPhoto();
-  });
-</script>
-
+{{include file="prettyphoto.tpl"}}
 <div class="photo-album-image-wrapper" id="photo-album-image-wrapper-{{$id}}">
 	<a href="{{$photolink}}" class="photo-album-photo-link" id="photo-album-photo-link-{{$id}}" title="{{$phototitle}}" rel="{{$rel}}">
 		<img src="{{$imgsrc}}" alt="{{$imgalt}}" title="{{$phototitle}}" class="photo-album-photo lframe resize{{$twist}}" id="photo-album-photo-{{$id}}" />
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index fce6f6fa8..f825dcba6 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -1,13 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script type="text/javascript" charset="utf-8">
-  $(document).ready(function(){
-    $("a[rel^='prettyPhoto']").prettyPhoto();
-  });
-</script>
+{{include file="prettyphoto.tpl"}}
 
 <div id="live-display"></div>
 <h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
diff --git a/view/tpl/prettyphoto.tpl b/view/tpl/prettyphoto.tpl
new file mode 100644
index 000000000..6d047e620
--- /dev/null
+++ b/view/tpl/prettyphoto.tpl
@@ -0,0 +1,6 @@
+<script type="text/javascript" charset="utf-8">
+  $(document).ready(function(){
+    $("a[rel^='prettyPhoto']").prettyPhoto();
+  });
+</script>
+
diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl
index 8ae9a1da8..5c00dee6b 100644
--- a/view/tpl/webpagelist.tpl
+++ b/view/tpl/webpagelist.tpl
@@ -1,12 +1,13 @@
 {{if $pages}}
-<div id="pagelist-content-wrapper">
-{{foreach $pages as $key => $items}} 
-<ul class="page-list">
-{{foreach $items as $item}}
-<li><a href="editwebpage/{{$item.url}}">Edit</a> {{$item.title}}</li>
-{{/foreach}}
-</ul>
-<div class="clear"></div>
-</div>
-{{/foreach}}
+
+	   <div id="pagelist-content-wrapper">
+		{{foreach $pages as $key => $items}} 
+				{{foreach $items as $item}}
+					<div class="page-list-item"><a href="editwebpage/{{$item.url}}">{{$editlink}}</a> | <a href="page/{{$channel}}/{{$item.title}}">{{$view}}</a> {{$item.title}}</div>
+				{{/foreach}}
+		{{/foreach}}
+	   </div>
+	
+	   <div class="clear"></div>
+
 {{/if}}