Browse Source

more templates gone

tags/2.2
Friendika 9 years ago
parent
commit
f1db34eebc
24 changed files with 1465 additions and 1644 deletions
  1. +6
    -7
      mod/notifications.php
  2. +5
    -3
      mod/profile_photo.php
  3. +1445
    -1282
      util/messages.po
  4. +5
    -0
      util/strings.php
  5. +4
    -5
      view/cropbody.tpl
  6. +0
    -58
      view/de/cropbody.tpl
  7. +0
    -7
      view/de/intros-top.tpl
  8. +0
    -3
      view/de/registrations-top.tpl
  9. +0
    -16
      view/de/settings_nick_unset.tpl
  10. +0
    -7
      view/en/intros-top.tpl
  11. +0
    -3
      view/en/registrations-top.tpl
  12. +0
    -14
      view/en/settings_nick_unset.tpl
  13. +0
    -57
      view/fr/cropbody.tpl
  14. +0
    -7
      view/fr/intros-top.tpl
  15. +0
    -3
      view/fr/registrations-top.tpl
  16. +0
    -14
      view/fr/settings_nick_unset.tpl
  17. +0
    -57
      view/it/cropbody.tpl
  18. +0
    -7
      view/it/intros-top.tpl
  19. +0
    -3
      view/it/registrations-top.tpl
  20. +0
    -15
      view/it/settings_nick_unset.tpl
  21. +0
    -57
      view/sv/cropbody.tpl
  22. +0
    -6
      view/sv/intros-top.tpl
  23. +0
    -1
      view/sv/registrations-top.tpl
  24. +0
    -12
      view/sv/settings_nick_unset.tpl

+ 6
- 7
mod/notifications.php View File

@@ -65,12 +65,11 @@ function notifications_content(&$a) {
else
$sql_extra = " AND `ignore` = 0 ";


$tpl = load_view_file('view/intros-top.tpl');
$o .= replace_macros($tpl,array(
'$hide_url' => ((strlen($sql_extra)) ? 'notifications/all' : 'notifications' ),
'$hide_text' => ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests'))
));
$o .= '<h1>' . t('Pending Friend/Connect Notifications') . '</h1>' . "\r\n";
$o .= '<div id="notification-show-hide-wrapper" >';
$o .= '<a href="' . ((strlen($sql_extra)) ? 'notifications/all' : 'notifications' ) . '" id="notifications-show-hide-link" >'
. ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests')) . '</a></div>' . "\r\n";


$r = q("SELECT COUNT(*) AS `total` FROM `intro`
@@ -141,7 +140,7 @@ function notifications_content(&$a) {

if ($a->config['register_policy'] == REGISTER_APPROVE &&
$a->config['admin_email'] === $a->user['email']){
$o .= load_view_file('view/registrations-top.tpl');
$o .= '<h1>' . t('User registrations waiting for confirm') . '</h1>' . "\r\n";
$r = q("SELECT `register`.*, `contact`.`name`, `user`.`email`
FROM `register`


+ 5
- 3
mod/profile_photo.php View File

@@ -196,9 +196,11 @@ function profile_photo_content(&$a) {
$o .= replace_macros($tpl,array(
'$filename' => $filename,
'$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
'$image_url' => $a->get_baseurl() . '/photo/' . $filename
));

'$image_url' => $a->get_baseurl() . '/photo/' . $filename,
'$title' => t('Crop Image'),
'$desc' => t('Please adjust the image cropping for optimum viewing.'),
'$done' => t('Done Editing')
));
return $o;
}



+ 1445
- 1282
util/messages.po
File diff suppressed because it is too large
View File


+ 5
- 0
util/strings.php View File

@@ -321,6 +321,7 @@ $a->strings['See all %d comments'] = 'See all %d comments';
$a->strings['Invalid request identifier.'] = 'Invalid request identifier.';
$a->strings['Discard'] = 'Discard';
$a->strings['Ignore'] = 'Ignore';
$a->strings['Pending Friend/Connect Notifications'] = 'Pending Friend/Connect Notifications';
$a->strings['Show Ignored Requests'] = 'Show Ignored Requests';
$a->strings['Hide Ignored Requests'] = 'Hide Ignored Requests';
$a->strings['Claims to be known to you: '] = 'Claims to be known to you: ';
@@ -334,6 +335,7 @@ $a->strings['Friend/Connect Request'] = 'Friend/Connect Request';
$a->strings['New Follower'] = 'New Follower';
$a->strings['Approve'] = 'Approve';
$a->strings['No notifications.'] = 'No notifications.';
$a->strings['User registrations waiting for confirm'] = 'User registrations waiting for confirm';
$a->strings['No registrations.'] = 'No registrations.';
$a->strings['Login failed.'] = 'Login failed.';
$a->strings["Welcome back "] = "Welcome back ";
@@ -375,6 +377,9 @@ $a->strings['Profile'] = 'Profile';
$a->strings['Photos'] = 'Photos';
$a->strings['Image uploaded but image cropping failed.'] = 'Image uploaded but image cropping failed.';
$a->strings['Unable to process image'] = 'Unable to process image';
$a->strings['Crop Image'] = 'Crop Image';
$a->strings['Please adjust the image cropping for optimum viewing.'] = 'Please adjust the image cropping for optimum viewing.';
$a->strings['Done Editing'] = 'Done Editing';
$a->strings['Image uploaded successfully.'] = 'Image uploaded successfully.';
$a->strings['Profile Name is required.'] = 'Profile Name is required.';
$a->strings['Profile updated.'] = 'Profile updated.';


view/en/cropbody.tpl → view/cropbody.tpl View File

@@ -1,9 +1,9 @@
<h1>Crop Image</h1>
<h1>$title</h1>
<p id="cropimage-desc">
Please adjust the image cropping for optimum viewing.
$desc
</p>
<div id="cropimage-wrapper">
<img src="$image_url" id="croppa" class="imgCrop" alt="" />
<img src="$image_url" id="croppa" class="imgCrop" alt="$title" />
</div>
<div id="cropimage-preview-wrapper" >
<div id="previewWrap" ></div>
@@ -41,7 +41,6 @@ Please adjust the image cropping for optimum viewing.

<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" />
@@ -51,7 +50,7 @@ Please adjust the image cropping for optimum viewing.
<input type="hidden" name="width" id="width" />

<div id="crop-image-submit-wrapper" >
<input type="submit" name="submit" value="Done Editing" />
<input type="submit" name="submit" value="$done" />
</div>

</form>

+ 0
- 58
view/de/cropbody.tpl View File

@@ -1,58 +0,0 @@
<h1>Bild zuschneiden</h1>
<p id="cropimage-desc">
Zur optimalen Darstellung des Bildes kann es nun auf einen Bereich
zugeschnitten werden. Bitte wähle diesen Bereich.
</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="Done Editing" />
</div>

</form>

+ 0
- 7
view/de/intros-top.tpl View File

@@ -1,7 +0,0 @@
<h1>Schwebende Freundschafts/Kontakt Benachrichtigungen</h1>

<div id="notification-show-hide-wrapper" >
<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
</div>



+ 0
- 3
view/de/registrations-top.tpl View File

@@ -1,3 +0,0 @@
<h1>Schwebende Neuanmeldungen</h1>



+ 0
- 16
view/de/settings_nick_unset.tpl View File

@@ -1,16 +0,0 @@

<div id="settings-nick-wrapper" >
<p id="settings-nickname-desc">
Deine Profil URL ist im Moment <strong>'$baseurl/profile/$uid'</strong>.
Wenn du einen Spitznamen wählst kann man diese URL freundlicher ausdrücken
z.B. <strong>'spitzname@$basepath'</strong>.
<br />
Einmal gewählt kann der Spitzname nicht mehr geändert werden. Er
<strong>muss</strong> mit einem Buchstaben beginnen. Es sind ausschließlich
Buchstaben, Zahlen sowie Binde- und Unterstriche erlaubt.
</p>
<label id="settings-nick-label" for="settings-nick" >URL Spitzname: </label>
<input type="text" name="nick" id="settings-nick" value="$nickname" />
</div>
<div id="settings-nick-end" ></div>


+ 0
- 7
view/en/intros-top.tpl View File

@@ -1,7 +0,0 @@
<h1>Pending Friend/Connect Notifications</h1>

<div id="notification-show-hide-wrapper" >
<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
</div>



+ 0
- 3
view/en/registrations-top.tpl View File

@@ -1,3 +0,0 @@
<h1>User registrations waiting for confirm</h1>



+ 0
- 14
view/en/settings_nick_unset.tpl View File

@@ -1,14 +0,0 @@

<div id="settings-nick-wrapper" >
<p id="settings-nickname-desc">
Your profile URL is currently <strong>'$baseurl/profile/$uid'</strong>.
Setting a nickname will allow a friendly profile URL such as
<strong>'nickname@$basepath'</strong>.
<br />
Once set, it can never be changed. The nickname <strong>must</strong> start with a letter; and only letters, numbers, dashes, and underscores are allowed.
</p>
<label id="settings-nick-label" for="settings-nick" >URL Nickname: </label>
<input type="text" name="nick" id="settings-nick" value="$nickname" />
</div>
<div id="settings-nick-end" ></div>


+ 0
- 57
view/fr/cropbody.tpl View File

@@ -1,57 +0,0 @@
<h1>Crop Image</h1>
<p id="cropimage-desc">
Merci d'ajuster le cadre de l'image pour un affichage optimal.
</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="Edition terminée" />
</div>

</form>

+ 0
- 7
view/fr/intros-top.tpl View File

@@ -1,7 +0,0 @@
<h1>Demandes d'amitié/mise en relation en attente</h1>

<div id="notification-show-hide-wrapper" >
<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
</div>



+ 0
- 3
view/fr/registrations-top.tpl View File

@@ -1,3 +0,0 @@
<h1>Inscriptions d'utilisateurs en attente de confirmation</h1>



+ 0
- 14
view/fr/settings_nick_unset.tpl View File

@@ -1,14 +0,0 @@

<div id="settings-nick-wrapper" >
<p id="settings-nickname-desc">
Votre adresse (URL) de profil est actuellement <strong>'$baseurl/profile/$uid'</strong>.
Choisir un pseudo vous donnera une URL plus simple à retenir, comme
<strong>'nickname@$basepath'</strong>.
<br />
Une fois défini, il ne pourra plus changer. Le pseudo <strong>doit</strong> débuter par une lettre; et seuls lettres, nombres, tirets et sous-tirets (_) sont autorisés.
</p>
<label id="settings-nick-label" for="settings-nick" >Pseudo: </label>
<input type="text" name="nick" id="settings-nick" value="$nickname" />
</div>
<div id="settings-nick-end" ></div>


+ 0
- 57
view/it/cropbody.tpl View File

@@ -1,57 +0,0 @@
<h1>Ritaglia Immagine</h1>
<p id="cropimage-desc">
Sistema il ritaglio dell'immagine per una visualizzazione ottimale.
</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="Fatto" />
</div>

</form>

+ 0
- 7
view/it/intros-top.tpl View File

@@ -1,7 +0,0 @@
<h1>Notifiche di Amicizia/Collegamento in Attesa</h1>

<div id="notification-show-hide-wrapper" >
<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
</div>



+ 0
- 3
view/it/registrations-top.tpl View File

@@ -1,3 +0,0 @@
<h1>Registrazioni in attesa di conferma</h1>



+ 0
- 15
view/it/settings_nick_unset.tpl View File

@@ -1,15 +0,0 @@

<div id="settings-nick-wrapper" >
<p id="settings-nickname-desc">
L'URL del tuo profilo &egrave; <strong>'$baseurl/profile/$uid'</strong>.
Impostare un soprannome permetter&agrave; di avere un URL più aimchevole, come
<strong>'soprannome@$basepath'</strong>.
<br />
Una volta impostato, non potr&agreve; pi&ugrave; essere cambiato. Il soprannome <strong>deve</strong>
cominciare con una lettera; nel soprannome sono permessi solo lettere, numeri, trattini (-) e underscore (_).
</p>
<label id="settings-nick-label" for="settings-nick" >Soprannome: </label>
<input type="text" name="nick" id="settings-nick" value="$nickname" />
</div>
<div id="settings-nick-end" ></div>


+ 0
- 57
view/sv/cropbody.tpl View File

@@ -1,57 +0,0 @@
<h1>Besk&auml;r bilden</h1>
<p id="cropimage-desc">
V&auml;lj hur du vill att bilden ska besk&auml;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>

+ 0
- 6
view/sv/intros-top.tpl View File

@@ -1,6 +0,0 @@
<h1>V&auml;ntande f&ouml;rfr&aring;gningar om v&auml;nskap/kontakt</h1>

<div id="notification-show-hide-wrapper" >
<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
</div>


+ 0
- 1
view/sv/registrations-top.tpl View File

@@ -1 +0,0 @@
<h1>Registreringar från användare som inv&auml;ntar godk&auml;nnande</h1>

+ 0
- 12
view/sv/settings_nick_unset.tpl View File

@@ -1,12 +0,0 @@
<div id="settings-nick-wrapper" >
<p id="settings-nickname-desc">
Din profiladress &auml;r f&ouml;r n&auml;rvarande<strong>'$baseurl/profile/$uid'</strong>.
Genom att ange ett smeknamn/nick kan din adress bli enklare, s&aring; h&auml;r:
<strong>'nickname@$basepath'</strong>.
<br />
N&auml;r smeknamn/nick har angetts kan det <strong>inte</strong> &auml;ndras. Det <strong>m&aring;ste</strong> inledas med en bokstav, och bara bokst&auml;ver, siffror, bindestreck och understrykningstecken f&aring;r anv&auml;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>

Loading…
Cancel
Save