aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-26 02:51:40 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-03-26 02:51:40 -0400
commit629a66793c245d39ca47523a6fbc790fae0cbe3b (patch)
treee1714c8fca95087ff97a844688c40ade60c3b8ef /view
parent2147ffa48734e50c9df1ea91ce100bf5336eacc2 (diff)
parent37f02424f801b3132b75b39d4132f35025667a75 (diff)
downloadvolse-hubzilla-629a66793c245d39ca47523a6fbc790fae0cbe3b.tar.gz
volse-hubzilla-629a66793c245d39ca47523a6fbc790fae0cbe3b.tar.bz2
volse-hubzilla-629a66793c245d39ca47523a6fbc790fae0cbe3b.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: small fix don't include friend suggestions for people with the same name as current contacts. This will remove a lot of #whoaretonybaldwin. position the theme-preview on settings page more wordsmithing of the Friendica invitation email screenshot gallery theme preview for end users * master:
Diffstat (limited to 'view')
-rwxr-xr-xview/field_themeselect.tpl9
-rwxr-xr-xview/settings.tpl2
-rw-r--r--view/theme/darkbubble/screenshot.jpgbin0 -> 71056 bytes
-rw-r--r--view/theme/darkzero/screenshot.jpgbin0 -> 84200 bytes
-rwxr-xr-xview/theme/diabook-blue/communityhome.tpl2
-rwxr-xr-xview/theme/diabook-blue/theme.php7
-rwxr-xr-xview/theme/diabook/communityhome.tpl2
-rw-r--r--view/theme/diabook/screenshot.jpgbin0 -> 59386 bytes
-rwxr-xr-xview/theme/diabook/theme.php7
-rw-r--r--view/theme/dispy/screenshot.jpgbin0 -> 60400 bytes
-rw-r--r--view/theme/duepuntozero/screenshot.jpgbin0 -> 72559 bytes
-rwxr-xr-xview/theme/duepuntozero/style.css4
-rw-r--r--view/theme/easterbunny/screenshot.jpgbin0 -> 82074 bytes
-rw-r--r--view/theme/greenzero/screenshot.jpgbin0 -> 71106 bytes
-rw-r--r--view/theme/quattro-green/screenshot.pngbin0 -> 147135 bytes
-rw-r--r--view/theme/quattro/screenshot.jpgbin0 -> 71709 bytes
-rw-r--r--view/theme/slackr/screenshot.jpgbin0 -> 75494 bytes
-rw-r--r--view/theme/testbubble/screenshot.jpgbin0 -> 67853 bytes
-rw-r--r--view/theme/vier/screenshot.jpgbin0 -> 78347 bytes
19 files changed, 21 insertions, 12 deletions
diff --git a/view/field_themeselect.tpl b/view/field_themeselect.tpl
new file mode 100755
index 000000000..f9f99492c
--- /dev/null
+++ b/view/field_themeselect.tpl
@@ -0,0 +1,9 @@
+
+ <div class='field select'>
+ <label for='id_$field.0'>$field.1</label>
+ <select name='$field.0' id='id_$field.0' onchange="previewTheme(this);" >
+ {{ for $field.4 as $opt=>$val }}<option value="$opt" {{ if $opt==$field.2 }}selected="selected"{{ endif }}>$val</option>{{ endfor }}
+ </select>
+ <span class='field_help'>$field.3</span>
+ <div id="theme-preview"></div>
+ </div>
diff --git a/view/settings.tpl b/view/settings.tpl
index 2b739c968..75225a0f1 100755
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -28,7 +28,7 @@ $nickname_block
{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
{{inc field_input.tpl with $field=$defloc }}{{endinc}}
{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
-{{inc field_select.tpl with $field=$theme }}{{endinc}}
+{{inc field_themeselect.tpl with $field=$theme }}{{endinc}}
{{inc field_input.tpl with $field=$ajaxint }}{{endinc}}
{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}}
{{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}}
diff --git a/view/theme/darkbubble/screenshot.jpg b/view/theme/darkbubble/screenshot.jpg
new file mode 100644
index 000000000..0d9af2c04
--- /dev/null
+++ b/view/theme/darkbubble/screenshot.jpg
Binary files differ
diff --git a/view/theme/darkzero/screenshot.jpg b/view/theme/darkzero/screenshot.jpg
new file mode 100644
index 000000000..e91ae13f5
--- /dev/null
+++ b/view/theme/darkzero/screenshot.jpg
Binary files differ
diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl
index 5b807c8ad..5bae06178 100755
--- a/view/theme/diabook-blue/communityhome.tpl
+++ b/view/theme/diabook-blue/communityhome.tpl
@@ -46,7 +46,7 @@
</div>
{{ endif }}
-{{ if $lastusers_title }}
+{{ if $page }}
<div>$page</div>
{{ endif }}
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 2c878e6f0..a5f4490ba 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -18,7 +18,7 @@ $cssFile = null;
/**
* prints last community activity
*/
-function diabook_community_info(){
+function diabook_blue_community_info(){
$a = get_app();
//right_aside at networkpages
@@ -170,6 +170,7 @@ function diabook_community_info(){
if (sizeof($contacts) > 0)
$aside['$page'] = $page;
+
//END Community Page
@@ -214,7 +215,7 @@ if ($a->argv[0] === "network" && local_user()){
}
// COMMUNITY
- diabook_community_info();
+ diabook_blue_community_info();
// CUSTOM CSS
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-network.css";
@@ -227,7 +228,7 @@ if ($a->argv[0] === "network" && local_user()){
if ($a->argv[0] === "profile"){
// COMMUNITY
- diabook_community_info();
+ diabook_blue_community_info();
// CUSTOM CSS
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-profile.css";
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
index c1b395dbe..1ba9ad081 100755
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
@@ -46,7 +46,7 @@
</div>
{{ endif }}
-{{ if $lastusers_title }}
+{{ if $page }}
<div>$page</div>
{{ endif }}
diff --git a/view/theme/diabook/screenshot.jpg b/view/theme/diabook/screenshot.jpg
new file mode 100644
index 000000000..abc31e329
--- /dev/null
+++ b/view/theme/diabook/screenshot.jpg
Binary files differ
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 5b87e3142..5bd206100 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -252,12 +252,7 @@ $a->page['htmlhead'] .= <<< EOT
$('a.lightbox').fancybox(); // Select all links with lightbox class
});
- $(document).ready(function ()
-$('iframe').each(function()
-var url = $(this).attr("src");
-$(this).attr("src",url+"?wmode=transparent");
-);
-);
+
</script>
EOT;
diff --git a/view/theme/dispy/screenshot.jpg b/view/theme/dispy/screenshot.jpg
new file mode 100644
index 000000000..81ee35afb
--- /dev/null
+++ b/view/theme/dispy/screenshot.jpg
Binary files differ
diff --git a/view/theme/duepuntozero/screenshot.jpg b/view/theme/duepuntozero/screenshot.jpg
new file mode 100644
index 000000000..5f00ec39e
--- /dev/null
+++ b/view/theme/duepuntozero/screenshot.jpg
Binary files differ
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index b79b00ef4..b1c2fb77e 100755
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -249,6 +249,10 @@ div.wall-item-content-wrapper.shiny {
background: #FFFFC8;
}
+#theme-preview {
+ margin: 15px 0 15px 150px;
+}
+
/* from default */
#jot-perms-icon,
#profile-location,
diff --git a/view/theme/easterbunny/screenshot.jpg b/view/theme/easterbunny/screenshot.jpg
new file mode 100644
index 000000000..5ac613e78
--- /dev/null
+++ b/view/theme/easterbunny/screenshot.jpg
Binary files differ
diff --git a/view/theme/greenzero/screenshot.jpg b/view/theme/greenzero/screenshot.jpg
new file mode 100644
index 000000000..692ad354b
--- /dev/null
+++ b/view/theme/greenzero/screenshot.jpg
Binary files differ
diff --git a/view/theme/quattro-green/screenshot.png b/view/theme/quattro-green/screenshot.png
new file mode 100644
index 000000000..a764f4f9a
--- /dev/null
+++ b/view/theme/quattro-green/screenshot.png
Binary files differ
diff --git a/view/theme/quattro/screenshot.jpg b/view/theme/quattro/screenshot.jpg
new file mode 100644
index 000000000..7f50ec70e
--- /dev/null
+++ b/view/theme/quattro/screenshot.jpg
Binary files differ
diff --git a/view/theme/slackr/screenshot.jpg b/view/theme/slackr/screenshot.jpg
new file mode 100644
index 000000000..eb1586d5d
--- /dev/null
+++ b/view/theme/slackr/screenshot.jpg
Binary files differ
diff --git a/view/theme/testbubble/screenshot.jpg b/view/theme/testbubble/screenshot.jpg
new file mode 100644
index 000000000..ac9136a25
--- /dev/null
+++ b/view/theme/testbubble/screenshot.jpg
Binary files differ
diff --git a/view/theme/vier/screenshot.jpg b/view/theme/vier/screenshot.jpg
new file mode 100644
index 000000000..f8e0bf8e6
--- /dev/null
+++ b/view/theme/vier/screenshot.jpg
Binary files differ