diff options
Diffstat (limited to 'view/sv')
| -rw-r--r-- | view/sv/cropbody.tpl | 57 | ||||
| -rw-r--r-- | view/sv/head.tpl | 30 | ||||
| -rw-r--r-- | view/sv/insecure_net.tpl | 6 | ||||
| -rw-r--r-- | view/sv/intros-top.tpl | 6 | ||||
| -rw-r--r-- | view/sv/jot-header.tpl | 141 | ||||
| -rw-r--r-- | view/sv/msg-header.tpl | 103 | ||||
| -rw-r--r-- | view/sv/profile.php | 71 | ||||
| -rw-r--r-- | view/sv/profile_edit.tpl | 17 | ||||
| -rw-r--r-- | view/sv/profile_tabs.tpl | 7 | ||||
| -rw-r--r-- | view/sv/registrations-top.tpl | 1 | ||||
| -rw-r--r-- | view/sv/settings.tpl | 1 | ||||
| -rw-r--r-- | view/sv/settings_nick_unset.tpl | 12 | ||||
| -rw-r--r-- | view/sv/strings.php | 2 |
13 files changed, 12 insertions, 442 deletions
diff --git a/view/sv/cropbody.tpl b/view/sv/cropbody.tpl deleted file mode 100644 index a91a7eafc..000000000 --- a/view/sv/cropbody.tpl +++ /dev/null @@ -1,57 +0,0 @@ -<h1>Beskär bilden</h1> -<p id="cropimage-desc"> -Välj hur du vill att bilden ska beskäras. -</p> -<div id="cropimage-wrapper"> -<img src="$image_url" id="croppa" class="imgCrop" alt="" /> -</div> -<div id="cropimage-preview-wrapper" > -<div id="previewWrap" ></div> -</div> - -<script type="text/javascript" language="javascript"> - - function onEndCrop( coords, dimensions ) { - $( 'x1' ).value = coords.x1; - $( 'y1' ).value = coords.y1; - $( 'x2' ).value = coords.x2; - $( 'y2' ).value = coords.y2; - $( 'width' ).value = dimensions.width; - $( 'height' ).value = dimensions.height; - } - - Event.observe( window, 'load', function() { - new Cropper.ImgWithPreview( - 'croppa', - { - previewWrap: 'previewWrap', - minWidth: 175, - minHeight: 175, - maxWidth: 640, - maxHeight: 640, - ratioDim: { x: 100, y:100 }, - displayOnInit: true, - onEndCrop: onEndCrop - } - ); - } - ); - -</script> - -<form action="profile_photo/$resource" id="crop-image-form" method="post" /> - -<input type="hidden" name="imagename" value="$hash" /> -<input type="hidden" name="cropfinal" value="1" /> -<input type="hidden" name="xstart" id="x1" /> -<input type="hidden" name="ystart" id="y1" /> -<input type="hidden" name="xfinal" id="x2" /> -<input type="hidden" name="yfinal" id="y2" /> -<input type="hidden" name="height" id="height" /> -<input type="hidden" name="width" id="width" /> - -<div id="crop-image-submit-wrapper" > -<input type="submit" name="submit" value="Spara" /> -</div> - -</form>
\ No newline at end of file diff --git a/view/sv/head.tpl b/view/sv/head.tpl deleted file mode 100644 index 828fcb13d..000000000 --- a/view/sv/head.tpl +++ /dev/null @@ -1,30 +0,0 @@ -<meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> -<base href="$baseurl" /> -<meta name="generator" content="$generator" /> -<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" /> -<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" /> - -<!--[if IE]> -<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script> -<![endif]--> -<script type="text/javascript" src="$baseurl/include/jquery.js" ></script> -<script type="text/javascript" src="$baseurl/include/main.js" ></script> -<script> - - function confirmDelete() { return confirm("Ta bort?"); } - function commentOpen(obj,id) { - if(obj.value == 'Comment') { - obj.value = ''; - obj.className = "comment-edit-text-full"; - openMenu("comment-edit-submit-wrapper-" + id); - } - } - function commentClose(obj,id) { - if(obj.value == '') { - obj.value = 'Comment'; - obj.className="comment-edit-text-empty"; - closeMenu("comment-edit-submit-wrapper-" + id); - } - } - -</script> diff --git a/view/sv/insecure_net.tpl b/view/sv/insecure_net.tpl deleted file mode 100644 index b354ed12d..000000000 --- a/view/sv/insecure_net.tpl +++ /dev/null @@ -1,6 +0,0 @@ -<div id="profile-edit-insecure"> -<p> -Det sociala nätverk som $name tillhör är öppet och saknar nästan helt möjlighet att begränsa insynen. -Kom alltså ihåg att vara lite diskret. -</p> -</div> diff --git a/view/sv/intros-top.tpl b/view/sv/intros-top.tpl deleted file mode 100644 index 0aa01c5da..000000000 --- a/view/sv/intros-top.tpl +++ /dev/null @@ -1,6 +0,0 @@ -<h1>Väntande förfrågningar om vänskap/kontakt</h1> - -<div id="notification-show-hide-wrapper" > -<a href="$hide_url" id="notification-show-hide-link">$hide_text</a> -</div> - diff --git a/view/sv/jot-header.tpl b/view/sv/jot-header.tpl deleted file mode 100644 index 0296d0eb6..000000000 --- a/view/sv/jot-header.tpl +++ /dev/null @@ -1,141 +0,0 @@ - -<script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> -<script language="javascript" type="text/javascript"> - -var editor; - -tinyMCE.init({ - theme : "advanced", - mode : "specific_textareas", - editor_selector: /(profile-jot-text|prvmail-text)/, - plugins : "bbcode,paste", - theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code", - theme_advanced_buttons2 : "", - theme_advanced_buttons3 : "", - theme_advanced_toolbar_location : "top", - theme_advanced_toolbar_align : "center", - theme_advanced_blockformats : "blockquote,code", - paste_text_sticky : true, - entity_encoding : "raw", - add_unload_trigger : false, - remove_linebreaks : false, - force_p_newlines : false, - force_br_newlines : true, - forced_root_block : '', - convert_urls: false, - content_css: "$baseurl/view/custom_tinymce.css", - //Character count - theme_advanced_path : false, - setup : function(ed) { - ed.onKeyUp.add(function(ed, e) { - var txt = tinyMCE.activeEditor.getContent(); - var text = txt.length; - if(txt.length <= 140) { - $('#character-counter').removeClass('red'); - $('#character-counter').removeClass('orange'); - $('#character-counter').addClass('grey'); - } - if((txt.length > 140) && (txt .length <= 420)) { - $('#character-counter').removeClass('grey'); - $('#character-counter').removeClass('red'); - $('#character-counter').addClass('orange'); - } - if(txt.length > 420) { - $('#character-counter').removeClass('grey'); - $('#character-counter').removeClass('orange'); - $('#character-counter').addClass('red'); - } - $('#character-counter').text(text); - }); - - ed.onInit.add(function(ed) { - ed.pasteAsPlainText = true; - }); - - } -}); - -</script> -<script type="text/javascript" src="include/ajaxupload.js" ></script> -<script> - $(document).ready(function() { - var uploader = new window.AjaxUpload( - 'wall-image-upload', - { action: 'wall_upload/$nickname', - name: 'userfile', - onSubmit: function(file,ext) { $('#profile-rotator').show(); }, - onComplete: function(file,response) { - tinyMCE.execCommand('mceInsertRawHTML',false,response); - $('#profile-rotator').hide(); - } - } - ); - $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { - var selstr; - $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() { - selstr = $(this).text(); - $('#profile-jot-perms img').attr('src', 'images/lock_icon.gif'); - $('.profile-jot-net input').attr('disabled', 'disabled'); - }); - if(selstr == null) { - $('#profile-jot-perms img').attr('src', 'images/unlock_icon.gif'); - $('.profile-jot-net input').attr('disabled', false); - } - - }).trigger('change'); - - }); - - function jotGetLink() { - reply = prompt("Please enter a link URL:"); - if(reply && reply.length) { - $('#profile-rotator').show(); - $.get('parse_url?url=' + reply, function(data) { - tinyMCE.execCommand('mceInsertRawHTML',false,data); - $('#profile-rotator').hide(); - }); - } - } - - function jotGetVideo() { - reply = prompt("Please enter a YouTube link:"); - if(reply && reply.length) { - tinyMCE.execCommand('mceInsertRawHTML',false,'[youtube]' + reply + '[/youtube]'); - } - } - - function jotGetLocation() { - reply = prompt("Where are you right now?", $('#jot-location').val()); - if(reply && reply.length) { - $('#jot-location').val(reply); - } - } - - - function linkdropper(event) { - var linkFound = event.dataTransfer.types.contains("text/uri-list"); - if(linkFound) - event.preventDefault(); - } - - function linkdrop(event) { - var reply = event.dataTransfer.getData("text/uri-list"); - event.target.textContent = reply; - event.preventDefault(); - if(reply && reply.length) { - $('#profile-rotator').show(); - $.get('parse_url?url=' + reply, function(data) { - tinyMCE.execCommand('mceInsertRawHTML',false,data); - $('#profile-rotator').hide(); - }); - } - } - - function jotClearLocation() { - $('#jot-coord').val(''); - $('#profile-nolocation-wrapper').hide(); - } - - $geotag - -</script> diff --git a/view/sv/msg-header.tpl b/view/sv/msg-header.tpl deleted file mode 100644 index 2189b7fed..000000000 --- a/view/sv/msg-header.tpl +++ /dev/null @@ -1,103 +0,0 @@ - -<script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> -<script language="javascript" type="text/javascript"> - -tinyMCE.init({ - theme : "advanced", - mode : "specific_textareas", - editor_selector: /(profile-jot-text|prvmail-text)/, - plugins : "bbcode,paste", - theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor", - theme_advanced_buttons2 : "", - theme_advanced_buttons3 : "", - theme_advanced_toolbar_location : "top", - theme_advanced_toolbar_align : "center", - theme_advanced_blockformats : "blockquote,code", - paste_text_sticky : true, - entity_encoding : "raw", - add_unload_trigger : false, - remove_linebreaks : false, - force_p_newlines : false, - force_br_newlines : true, - forced_root_block : '', - convert_urls: false, - content_css: "$baseurl/view/custom_tinymce.css", - //Character count - theme_advanced_path : false, - setup : function(ed) { - ed.onKeyUp.add(function(ed, e) { - var txt = tinyMCE.activeEditor.getContent(); - var text = txt.length; - if(txt.length <= 140) { - $('#character-counter').removeClass('red'); - $('#character-counter').removeClass('orange'); - $('#character-counter').addClass('grey'); - } - if((txt.length > 140) && (txt .length <= 420)) { - $('#character-counter').removeClass('grey'); - $('#character-counter').removeClass('red'); - $('#character-counter').addClass('orange'); - } - if(txt.length > 420) { - $('#character-counter').removeClass('grey'); - $('#character-counter').removeClass('orange'); - $('#character-counter').addClass('red'); - } - $('#character-counter').text(text); - }); - - ed.onInit.add(function(ed) { - ed.pasteAsPlainText = true; - }); - } -}); - -</script> -<script type="text/javascript" src="include/ajaxupload.js" ></script> -<script> - $(document).ready(function() { - var uploader = new window.AjaxUpload( - 'prvmail-upload', - { action: 'wall_upload/$nickname', - name: 'userfile', - onSubmit: function(file,ext) { $('#profile-rotator').show(); }, - onComplete: function(file,response) { - tinyMCE.execCommand('mceInsertRawHTML',false,response); - $('#profile-rotator').hide(); - } - } - ); - - }); - - function jotGetLink() { - reply = prompt("Please enter a link URL:"); - if(reply && reply.length) { - $('#profile-rotator').show(); - $.get('parse_url?url=' + reply, function(data) { - tinyMCE.execCommand('mceInsertRawHTML',false,data); - $('#profile-rotator').hide(); - }); - } - } - - function linkdropper(event) { - var linkFound = event.dataTransfer.types.contains("text/uri-list"); - if(linkFound) - event.preventDefault(); - } - - function linkdrop(event) { - var reply = event.dataTransfer.getData("text/uri-list"); - event.target.textContent = reply; - event.preventDefault(); - if(reply && reply.length) { - $('#profile-rotator').show(); - $.get('parse_url?url=' + reply, function(data) { - tinyMCE.execCommand('mceInsertRawHTML',false,data); - $('#profile-rotator').hide(); - }); - } - } - -</script> diff --git a/view/sv/profile.php b/view/sv/profile.php deleted file mode 100644 index 6c551e185..000000000 --- a/view/sv/profile.php +++ /dev/null @@ -1,71 +0,0 @@ -<!DOCTYPE html ><?php // This is a perfect example of why I prefer to use template files rather than mixed PHP/HTML ?> -<html> -<head> - <title><?php if(x($page,'title')) echo $page['title']; ?></title> - <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?> -</head> -<body> -<header><?php if(x($page,'header')) echo $page['header']; ?></header> -<nav><div id="top-margin"></div><?php if(x($page,'nav')) echo $page['nav']; ?></nav> -<aside> -<?php if((is_array($profile)) && count($profile)) { ?> -<div class="vcard"> - <?php if(strlen($profile['name'])) { ?> - <div class="fn"><?php echo $profile['name']; ?></div> - <?php } ?> - - <?php if(strlen($profile['photo'])) { ?> - <div id="profile-photo-wrapper"><img class="photo" src="<?php echo $profile['photo']; ?>" alt="<?php echo $profile['name']; ?>" /></div> - <?php } ?> - - <div id="profile-extra-links"> - <ul> - <?php if($profile['uid'] != $_SESSION['uid']) { ?> - <li><a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['nickname']; ?>">Connect</a></li> - <?php } ?> - </ul> - - </div> - - <?php if ( (strlen($profile['address'])) - || (strlen($profile['locality'])) - || (strlen($profile['region'])) - || (strlen($profile['postal-code'])) - || (strlen($profile['country-name']))) { ?> - <div class="location">Plats: - <div class="adr"> - <div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></div> - <span class="city-state-zip"><span class="locality"><?php echo $profile['locality']; ?></span><?php if(strlen($profile['locality'])) echo ', '; ?><span class="region"><?php echo $profile['region'] ?></span><?php if(strlen($profile['postal-code'])) { ?> <span class="postal-code"><?php echo $profile['postal-code']; ?></span><?php } ?></span> - <span class="country-name"><?php echo $profile['country-name']; ?></span> - </div> - </div> - - <?php } ?> - - <?php if(strlen($profile['gender'])) { ?> - <div class="mf">Kön: <span class="x-gender"><?php echo $profile['gender']; ?></span></div> - - <?php } ?> - - <?php if(strlen($profile['pubkey'])) { ?> - <div class="key" style="display: none;"><?php echo $profile['pubkey']; ?></div> - <?php } ?> -</div> -<?php } ?> -<?php if(strlen($profile['marital'])) { ?> -<div class="marital"><span class="marital-label"><span class="heart">♥</span> Civilstatus: </span><span class="marital-text"><?php echo $profile['marital']; ?></span></div> -<?php } ?> -<?php if(strlen($profile['homepage'])) { ?> -<div class="homepage"><span class="homepage-label">Webbplats: </span><span class="homepage-url"><?php echo linkify($profile['homepage']); ?></span></div> -<?php } ?> -<?php if(x($page,'aside')) echo $page['aside'] ?> -</aside> -<section> -<?php if(x($page,'content')) echo $page['content']; ?> -<div id="page-footer"></div> -</section> -<footer> -<?php if(x($page,'footer')) echo $page['footer']; ?> -</footer> -</body> -</html> diff --git a/view/sv/profile_edit.tpl b/view/sv/profile_edit.tpl index 8d47877f2..5025fd5a8 100644 --- a/view/sv/profile_edit.tpl +++ b/view/sv/profile_edit.tpl @@ -134,12 +134,17 @@ $sexual </div> <div id="profile-edit-religion-end"></div> -<div id="profile-edit-keywords-wrapper" > -<label id="profile-edit-keywords-label" for="profile-edit-keywords" >Nyckelord: </label> -<input type="text" size="32" name="keywords" id="profile-edit-keywords" title="Exempel: fiske fotografering delfiner" value="$keywords" /> -</div><div id="profile-edit-keywords-desc">(Används vid profilsökning, visas inte för andra)</div> -<div id="profile-edit-keywords-end"></div> - +<div id="profile-edit-pubkeywords-wrapper" > +<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Public Nyckelord: </label> +<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Exempel: fiske fotografering delifner" value="$pub_keywords" /> +</div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div> +<div id="profile-edit-pubkeywords-end"></div> + +<div id="profile-edit-prvkeywords-wrapper" > +<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Private Nyckelord: </label> +<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Exempel: fiske fotografering delfiner" value="$prv_keywords" /> +</div><div id="profile-edit-prvkeywords-desc">(Används vid profilsökning, visas inte för andra)</div> +<div id="profile-edit-prvkeywords-end"></div> <div class="profile-edit-submit-wrapper" > <input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" /> diff --git a/view/sv/profile_tabs.tpl b/view/sv/profile_tabs.tpl deleted file mode 100644 index b5d55302b..000000000 --- a/view/sv/profile_tabs.tpl +++ /dev/null @@ -1,7 +0,0 @@ - -<div id="profile-tabs-wrapper" > - <a href="$url" id="profile-tab-status-link" class="profile-tabs" >Status</a> - <a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >Profil</a> - <a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >Foton</a> -<div id="profile-tabs-end"></div> -</div> diff --git a/view/sv/registrations-top.tpl b/view/sv/registrations-top.tpl deleted file mode 100644 index 24e13abca..000000000 --- a/view/sv/registrations-top.tpl +++ /dev/null @@ -1 +0,0 @@ -<h1>Registreringar från användare som inväntar godkännande</h1> diff --git a/view/sv/settings.tpl b/view/sv/settings.tpl index bfcad64c8..2ab07af0c 100644 --- a/view/sv/settings.tpl +++ b/view/sv/settings.tpl @@ -98,7 +98,6 @@ $profile_in_net_dir <div id="settings-blockw-end" ></div> - <div id="settings-expire-desc">Ta automatiskt bort inlägg som är äldre än <input type="text" size="3" name="expire" value="$expire" /> dagar</div> <div id="settings-expire-end"></div> diff --git a/view/sv/settings_nick_unset.tpl b/view/sv/settings_nick_unset.tpl deleted file mode 100644 index 5e115ff68..000000000 --- a/view/sv/settings_nick_unset.tpl +++ /dev/null @@ -1,12 +0,0 @@ -<div id="settings-nick-wrapper" > -<p id="settings-nickname-desc"> -Din profiladress är för närvarande<strong>'$baseurl/profile/$uid'</strong>. -Genom att ange ett smeknamn/nick kan din adress bli enklare, så här: -<strong>'nickname@$basepath'</strong>. -<br /> -När smeknamn/nick har angetts kan det <strong>inte</strong> ändras. Det <strong>måste</strong> inledas med en bokstav, och bara bokstäver, siffror, bindestreck och understrykningstecken får användas. -</p> -<label id="settings-nick-label" for="settings-nick" >URL Smeknamn/nick: </label> -<input type="text" name="nick" id="settings-nick" value="$nickname" /> -</div> -<div id="settings-nick-end" ></div> diff --git a/view/sv/strings.php b/view/sv/strings.php index 42d2d6d55..df1b34465 100644 --- a/view/sv/strings.php +++ b/view/sv/strings.php @@ -1161,4 +1161,4 @@ $a->strings['US/Samoa'] = 'USA/Samoa'; $a->strings['UTC'] = 'UTC'; $a->strings['W-SU'] = 'W-SU'; $a->strings['WET'] = 'WET'; -$a->strings['Zulu'] = 'Zulu';
\ No newline at end of file +$a->strings['Zulu'] = 'Zulu'; |