diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/php/theme_init.php | 1 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 9 | ||||
| -rw-r--r-- | view/tpl/email_notify_html.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/head.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/jot-header.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/smarty3/email_notify_html.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/smarty3/head.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/smarty3/jot-header.tpl | 8 |
8 files changed, 22 insertions, 12 deletions
diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 3ed85ccf1..59f2ff0cc 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -11,6 +11,7 @@ head_add_css('library/jslider/css/jslider.css'); head_add_css('library/prettyphoto/css/prettyPhoto.css'); head_add_js('js/jquery.js'); +head_add_js('js/jquery-migrate-1.1.1.js'); head_add_js('js/jquery.textinputs.js'); head_add_js('js/fk.autocomplete.js'); head_add_js('library/fancybox/jquery.fancybox-1.3.4.pack.js'); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 26d296216..165eefc3d 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3659,6 +3659,15 @@ ul.menu-popup { width: 690px; float:left; } + +div.pp_pic_holder { +width: 800px !important; +} + +.pp_content { +width: 100% !important; +} + #acl-search { float:right; background: #ffffff url("../../../../images/search_18.png") no-repeat right center; diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl index 3e1a814c5..c6c1ea83f 100644 --- a/view/tpl/email_notify_html.tpl +++ b/view/tpl/email_notify_html.tpl @@ -7,7 +7,7 @@ <body> <table style="border:1px solid #ccc"> <tbody> - <tr><td colspan="2" style="background:#ff0000; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/fred-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">$product</div><div style="clear: both;"></div></td></tr> + <tr><td colspan="2" style="background:#ff0000; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/r!.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">$product</div><div style="clear: both;"></div></td></tr> <tr><td style="padding-top:22px;" colspan="2">$preamble</td></tr> diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index f1f02a2f0..704809f38 100644 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -16,7 +16,7 @@ $head_js <link rel="search" href="$baseurl/opensearch" type="application/opensearchdescription+xml" - title="Search in Friendica" /> + title="Search in Red" /> <script> diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 700a815cf..1c4c43903 100644 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -13,7 +13,7 @@ function initEditor(cb){ $("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); editor = true; - $("a#jot-perms-icon").fancybox({ + $("a#jot-perms-icon").prettyPhoto({ 'transitionIn' : 'elastic', 'transitionOut' : 'elastic' }); @@ -88,7 +88,7 @@ function initEditor(cb){ editor = true; // setup acl popup - $("a#jot-perms-icon").fancybox({ + $("a#jot-perms-icon").prettyPhoyo({ 'transitionIn' : 'elastic', 'transitionOut' : 'elastic' }); @@ -252,7 +252,7 @@ function enableOnUser(){ var bordercolor = $("input").css("border-color"); $.get('filer/', function(data){ - $.fancybox(data); + $.prettyPhoto(data); $("#id_term").keypress(function(){ $(this).css("border-color",bordercolor); }) @@ -270,7 +270,7 @@ function enableOnUser(){ // if(timer) clearTimeout(timer); // timer = setTimeout(NavUpdate,3000); liking = 1; - $.fancybox.close(); + $.prettyPhoto.close(); } else { $("#id_term").css("border-color","#FF0000"); } diff --git a/view/tpl/smarty3/email_notify_html.tpl b/view/tpl/smarty3/email_notify_html.tpl index 47b476688..18f7132db 100644 --- a/view/tpl/smarty3/email_notify_html.tpl +++ b/view/tpl/smarty3/email_notify_html.tpl @@ -12,7 +12,7 @@ <body> <table style="border:1px solid #ccc"> <tbody> - <tr><td colspan="2" style="background:#ff0000; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/fred-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr> + <tr><td colspan="2" style="background:#ff0000; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/r!.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr> <tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr> diff --git a/view/tpl/smarty3/head.tpl b/view/tpl/smarty3/head.tpl index 6d298cbb5..d6a06775e 100644 --- a/view/tpl/smarty3/head.tpl +++ b/view/tpl/smarty3/head.tpl @@ -21,7 +21,7 @@ <link rel="search" href="{{$baseurl}}/opensearch" type="application/opensearchdescription+xml" - title="Search in Friendica" /> + title="Search in Red" /> <script> diff --git a/view/tpl/smarty3/jot-header.tpl b/view/tpl/smarty3/jot-header.tpl index cce83e30b..c1b6d62e2 100644 --- a/view/tpl/smarty3/jot-header.tpl +++ b/view/tpl/smarty3/jot-header.tpl @@ -18,7 +18,7 @@ function initEditor(cb){ $("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); editor = true; - $("a#jot-perms-icon").fancybox({ + $("a#jot-perms-icon").prettyPhoto({ 'transitionIn' : 'elastic', 'transitionOut' : 'elastic' }); @@ -93,7 +93,7 @@ function initEditor(cb){ editor = true; // setup acl popup - $("a#jot-perms-icon").fancybox({ + $("a#jot-perms-icon").prettyPhoyo({ 'transitionIn' : 'elastic', 'transitionOut' : 'elastic' }); @@ -257,7 +257,7 @@ function enableOnUser(){ var bordercolor = $("input").css("border-color"); $.get('filer/', function(data){ - $.fancybox(data); + $.prettyPhoto(data); $("#id_term").keypress(function(){ $(this).css("border-color",bordercolor); }) @@ -275,7 +275,7 @@ function enableOnUser(){ // if(timer) clearTimeout(timer); // timer = setTimeout(NavUpdate,3000); liking = 1; - $.fancybox.close(); + $.prettyPhoto.close(); } else { $("#id_term").css("border-color","#FF0000"); } |