harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/hubzilla into pending_merge

Browse Source
This commit is contained in:
redmatrix
2016-03-26 14:34:19 -07:00
parent 971e7321c6 eeb1c463e3
commit d3f38c9f43
11 changed files with 743 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/widgets.php
+20 -6
View File
@@ -501,6 +501,12 @@ function widget_settings_menu($arr) {
if($abk)
$abook_self_id = $abk[0]['abook_id'];
$hublocs = q("select count(*) as total from hubloc where hubloc_hash = '%s'",
dbesc($channel['channel_hash'])
);
$hublocs = (($hublocs[0]['total'] > 1) ? true : false);
$tabs = array(
array(
'label' => t('Account settings'),
@@ -534,14 +540,16 @@ function widget_settings_menu($arr) {
'label' => t('Display settings'),
'url' => $a->get_baseurl(true).'/settings/display',
'selected' => ((argv(1) === 'display') ? 'active' : ''),
);
$tabs[] = array(
'label' => t('Connected apps'),
'url' => $a->get_baseurl(true) . '/settings/oauth',
'selected' => ((argv(1) === 'oauth') ? 'active' : ''),
);
if($hublocs) {
$tabs[] = array(
'label' => t('Manage locations'),
'url' => $a->get_baseurl(true) . '/locs',
'selected' => ((argv(1) === 'locs') ? 'active' : ''),
);
}
// IF can go away when UNO export and import is fully functional
if(! UNO) {
$tabs[] = array(
@@ -551,6 +559,12 @@ function widget_settings_menu($arr) {
);
}
$tabs[] = array(
'label' => t('Connected apps'),
'url' => $a->get_baseurl(true) . '/settings/oauth',
'selected' => ((argv(1) === 'oauth') ? 'active' : ''),
);
if($role === false || $role === 'custom') {
$tabs[] = array(
'label' => t('Connection Default Permissions'),
mod/channel.php
+2 -1
View File
@@ -34,7 +34,8 @@ function channel_init(&$a) {
$profile = argv(1);
}
$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $a->get_baseurl() . '/feed/' . $which .'" />' . "\r\n" ;
$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" title="' . t('Only posts') . '" href="' . $a->get_baseurl() . '/feed/' . $which . '?top=1" />' . "\r\n" ;
$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" title="' . t('Posts and comments') . '" href="' . $a->get_baseurl() . '/feed/' . $which . '" />' . "\r\n" ;
// Not yet ready for prime time
mod/locs.php
+6 -5
View File
@@ -110,11 +110,12 @@ function locs_content(&$a) {
$o = replace_macros(get_markup_template('locmanage.tpl'), array(
'$header' => t('Manage Channel Locations'),
'$loc' => t('Location (address)'),
'$mkprm' => t('Primary Location'),
'$drop' => t('Drop location'),
'$loc' => t('Location'),
'$addr' => t('Address'),
'$mkprm' => t('Primary'),
'$drop' => t('Drop'),
'$submit' => t('Submit'),
'$sync' => t('Sync now'),
'$sync' => t('Sync Now'),
'$sync_text' => t('Please wait several minutes between consecutive operations.'),
'$drop_text' => t('When possible, drop a location by logging into that website/hub and removing your channel.'),
'$last_resort' => t('Use this form to drop the location if the hub is no longer operating.'),
@@ -122,4 +123,4 @@ function locs_content(&$a) {
));
return $o;
}
}
mod/manage.php
+1 -3
View File
@@ -167,9 +167,7 @@ function manage_content(&$a) {
'$intros_format' => t('%d new introductions'),
'$channel_usage_message' => $channel_usage_message,
'$delegated_desc' => t('Delegated Channel'),
'$delegates' => $delegates,
'$locs' => t('Manage locations')
'$delegates' => $delegates
));
return $o;
view/css/mod_locs.css
+31 -2
View File
@@ -1,3 +1,32 @@
td {
padding: 10px;
#locs-index {
width: 100%;
}
#locs-index th:nth-child(1),
#locs-index td:nth-child(1){
padding: 7px 3px 7px 10px;
}
#locs-index th:nth-child(3),
#locs-index td:nth-child(3){
padding: 7px 3px;
}
#locs-index th:nth-child(4),
#locs-index td:nth-child(4){
padding: 7px 10px 7px 7px;
}
.primehub,
.drophub {
font-size: 1.2em;
}
.primehub:hover {
cursor: pointer;
}
.drophub:hover {
cursor: pointer;
color: red;
}
view/de/hmessages.po
+516 -510
View File
File diff suppressed because it is too large Load Diff
view/de/hstrings.php
+119 -119
View File
@@ -398,42 +398,6 @@ $a->strings["__ctx:noun__ Like"] = array(
0 => "Gefällt mir",
1 => "Gefällt mir",
);
$a->strings["Miscellaneous"] = "Verschiedenes";
$a->strings["YYYY-MM-DD or MM-DD"] = "JJJJ-MM-TT oder MM-TT";
$a->strings["Required"] = "Benötigt";
$a->strings["never"] = "Nie";
$a->strings["less than a second ago"] = "Vor weniger als einer Sekunde";
$a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "vor %1\$d %2\$s";
$a->strings["__ctx:relative_date__ year"] = array(
0 => "Jahr",
1 => "Jahre",
);
$a->strings["__ctx:relative_date__ month"] = array(
0 => "Monat",
1 => "Monate",
);
$a->strings["__ctx:relative_date__ week"] = array(
0 => "Woche",
1 => "Wochen",
);
$a->strings["__ctx:relative_date__ day"] = array(
0 => "Tag",
1 => "Tage",
);
$a->strings["__ctx:relative_date__ hour"] = array(
0 => "Stunde",
1 => "Stunden",
);
$a->strings["__ctx:relative_date__ minute"] = array(
0 => "Minute",
1 => "Minuten",
);
$a->strings["__ctx:relative_date__ second"] = array(
0 => "Sekunde",
1 => "Sekunden",
);
$a->strings["%1\$s's birthday"] = "%1\$ss Geburtstag";
$a->strings["Happy Birthday %1\$s"] = "Alles Gute zum Geburtstag, %1\$s";
$a->strings["Invalid data packet"] = "Ungültiges Datenpaket";
$a->strings["Unable to verify channel signature"] = "Konnte die Signatur des Kanals nicht verifizieren";
$a->strings["Unable to verify site signature for %s"] = "Kann die Signatur der Seite von %s nicht verifizieren";
@@ -614,6 +578,7 @@ $a->strings["For Administrators"] = "Für Administratoren";
$a->strings["For Developers"] = "Für Entwickler";
$a->strings["Site"] = "Seite";
$a->strings["Accounts"] = "Konten";
$a->strings["Member registrations waiting for confirmation"] = "Nutzer-Anmeldungen, die auf Bestätigung warten";
$a->strings["Channels"] = "Kanäle";
$a->strings["Security"] = "Sicherheit";
$a->strings["Plugins"] = "Plug-Ins";
@@ -623,7 +588,6 @@ $a->strings["Profile Fields"] = "Profil Felder";
$a->strings["DB updates"] = "DB-Aktualisierungen";
$a->strings["Logs"] = "Protokolle";
$a->strings["Plugin Features"] = "Plug-In Funktionen";
$a->strings["User registrations waiting for confirmation"] = "Nutzer-Anmeldungen, die auf Bestätigung warten";
$a->strings["View Photo"] = "Foto ansehen";
$a->strings["Edit Album"] = "Album bearbeiten";
$a->strings["prev"] = "vorherige";
@@ -731,61 +695,44 @@ $a->strings["Name:"] = "Name:";
$a->strings["Photo:"] = "Foto:";
$a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen.";
$a->strings["[Hubzilla:Notify]"] = "[Hubzilla:Benachrichtigung]";
$a->strings["Unable to obtain identity information from database"] = "Kann keine Identitäts-Informationen aus Datenbank beziehen";
$a->strings["Empty name"] = "Namensfeld leer";
$a->strings["Name too long"] = "Name ist zu lang";
$a->strings["No account identifier"] = "Keine Account-Kennung";
$a->strings["Nickname is required."] = "Spitzname ist erforderlich.";
$a->strings["Reserved nickname. Please choose another."] = "Reservierter Kurzname. Bitte wähle einen anderen.";
$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt.";
$a->strings["Unable to retrieve created identity"] = "Kann die erstellte Identität nicht empfangen";
$a->strings["Default Profile"] = "Standard-Profil";
$a->strings["Requested channel is not available."] = "Angeforderte Kanal nicht verfügbar.";
$a->strings["Requested profile is not available."] = "Erwünschte Profil ist nicht verfügbar.";
$a->strings["Change profile photo"] = "Profilfoto ändern";
$a->strings["Create New Profile"] = "Neues Profil erstellen";
$a->strings["Profile Image"] = "Profilfoto:";
$a->strings["Visible to everybody"] = "Für jeden sichtbar";
$a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten";
$a->strings["Gender:"] = "Geschlecht:";
$a->strings["Status:"] = "Status:";
$a->strings["Homepage:"] = "Homepage:";
$a->strings["Online Now"] = "gerade online";
$a->strings["g A l F d"] = "l, d. F, G:i \\U\\h\\r";
$a->strings["F d"] = "d. F";
$a->strings["[today]"] = "[Heute]";
$a->strings["Birthday Reminders"] = "Geburtstags Erinnerungen";
$a->strings["Birthdays this week:"] = "Geburtstage in dieser Woche:";
$a->strings["[No description]"] = "[Keine Beschreibung]";
$a->strings["Event Reminders"] = "Termin-Erinnerungen";
$a->strings["Events this week:"] = "Termine in dieser Woche:";
$a->strings["Full Name:"] = "Voller Name:";
$a->strings["Like this channel"] = "Dieser Kanal gefällt mir";
$a->strings["j F, Y"] = "j. F Y";
$a->strings["j F"] = "j. F";
$a->strings["Birthday:"] = "Geburtstag:";
$a->strings["Age:"] = "Alter:";
$a->strings["for %1\$d %2\$s"] = "seit %1\$d %2\$s";
$a->strings["Sexual Preference:"] = "Sexuelle Orientierung:";
$a->strings["Hometown:"] = "Heimatstadt:";
$a->strings["Tags:"] = "Schlagworte:";
$a->strings["Political Views:"] = "Politische Ansichten:";
$a->strings["Religion:"] = "Religion:";
$a->strings["About:"] = "Über:";
$a->strings["Hobbies/Interests:"] = "Hobbys/Interessen:";
$a->strings["Likes:"] = "Gefällt:";
$a->strings["Dislikes:"] = "Gefällt nicht:";
$a->strings["Contact information and Social Networks:"] = "Kontaktinformation und soziale Netzwerke:";
$a->strings["My other channels:"] = "Meine anderen Kanäle:";
$a->strings["Musical interests:"] = "Musikalische Interessen:";
$a->strings["Books, literature:"] = "Bücher, Literatur:";
$a->strings["Television:"] = "Fernsehen:";
$a->strings["Film/dance/culture/entertainment:"] = "Film/Tanz/Kultur/Unterhaltung:";
$a->strings["Love/Romance:"] = "Liebe/Romantik:";
$a->strings["Work/employment:"] = "Arbeit/Anstellung:";
$a->strings["School/education:"] = "Schule/Ausbildung:";
$a->strings["Like this thing"] = "Gefällt mir";
$a->strings["cover photo"] = "Cover Foto";
$a->strings["Miscellaneous"] = "Verschiedenes";
$a->strings["Birthday"] = "Geburtstag";
$a->strings["Age: "] = "Alter:";
$a->strings["YYYY-MM-DD or MM-DD"] = "JJJJ-MM-TT oder MM-TT";
$a->strings["Required"] = "Benötigt";
$a->strings["never"] = "Nie";
$a->strings["less than a second ago"] = "Vor weniger als einer Sekunde";
$a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "vor %1\$d %2\$s";
$a->strings["__ctx:relative_date__ year"] = array(
0 => "Jahr",
1 => "Jahre",
);
$a->strings["__ctx:relative_date__ month"] = array(
0 => "Monat",
1 => "Monate",
);
$a->strings["__ctx:relative_date__ week"] = array(
0 => "Woche",
1 => "Wochen",
);
$a->strings["__ctx:relative_date__ day"] = array(
0 => "Tag",
1 => "Tage",
);
$a->strings["__ctx:relative_date__ hour"] = array(
0 => "Stunde",
1 => "Stunden",
);
$a->strings["__ctx:relative_date__ minute"] = array(
0 => "Minute",
1 => "Minuten",
);
$a->strings["__ctx:relative_date__ second"] = array(
0 => "Sekunde",
1 => "Sekunden",
);
$a->strings["%1\$s's birthday"] = "%1\$ss Geburtstag";
$a->strings["Happy Birthday %1\$s"] = "Alles Gute zum Geburtstag, %1\$s";
$a->strings["Embedded content"] = "Eingebetteter Inhalt";
$a->strings["Embedding disabled"] = "Einbetten ausgeschaltet";
$a->strings["channel"] = "Kanal";
@@ -1024,6 +971,61 @@ $a->strings["male"] = "männlich";
$a->strings["%1\$s updated his %2\$s"] = "%1\$s hat sein %2\$s aktualisiert";
$a->strings["%1\$s updated their %2\$s"] = "%1\$s hat sein/ihr %2\$s aktualisiert";
$a->strings["profile photo"] = "Profilfoto";
$a->strings["Unable to obtain identity information from database"] = "Kann keine Identitäts-Informationen aus Datenbank beziehen";
$a->strings["Empty name"] = "Namensfeld leer";
$a->strings["Name too long"] = "Name ist zu lang";
$a->strings["No account identifier"] = "Keine Account-Kennung";
$a->strings["Nickname is required."] = "Spitzname ist erforderlich.";
$a->strings["Reserved nickname. Please choose another."] = "Reservierter Kurzname. Bitte wähle einen anderen.";
$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt.";
$a->strings["Unable to retrieve created identity"] = "Kann die erstellte Identität nicht empfangen";
$a->strings["Default Profile"] = "Standard-Profil";
$a->strings["Requested channel is not available."] = "Angeforderte Kanal nicht verfügbar.";
$a->strings["Requested profile is not available."] = "Erwünschte Profil ist nicht verfügbar.";
$a->strings["Change profile photo"] = "Profilfoto ändern";
$a->strings["Create New Profile"] = "Neues Profil erstellen";
$a->strings["Profile Image"] = "Profilfoto:";
$a->strings["Visible to everybody"] = "Für jeden sichtbar";
$a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten";
$a->strings["Gender:"] = "Geschlecht:";
$a->strings["Status:"] = "Status:";
$a->strings["Homepage:"] = "Homepage:";
$a->strings["Online Now"] = "gerade online";
$a->strings["g A l F d"] = "l, d. F, G:i \\U\\h\\r";
$a->strings["F d"] = "d. F";
$a->strings["[today]"] = "[Heute]";
$a->strings["Birthday Reminders"] = "Geburtstags Erinnerungen";
$a->strings["Birthdays this week:"] = "Geburtstage in dieser Woche:";
$a->strings["[No description]"] = "[Keine Beschreibung]";
$a->strings["Event Reminders"] = "Termin-Erinnerungen";
$a->strings["Events this week:"] = "Termine in dieser Woche:";
$a->strings["Full Name:"] = "Voller Name:";
$a->strings["Like this channel"] = "Dieser Kanal gefällt mir";
$a->strings["j F, Y"] = "j. F Y";
$a->strings["j F"] = "j. F";
$a->strings["Birthday:"] = "Geburtstag:";
$a->strings["Age:"] = "Alter:";
$a->strings["for %1\$d %2\$s"] = "seit %1\$d %2\$s";
$a->strings["Sexual Preference:"] = "Sexuelle Orientierung:";
$a->strings["Hometown:"] = "Heimatstadt:";
$a->strings["Tags:"] = "Schlagworte:";
$a->strings["Political Views:"] = "Politische Ansichten:";
$a->strings["Religion:"] = "Religion:";
$a->strings["About:"] = "Über:";
$a->strings["Hobbies/Interests:"] = "Hobbys/Interessen:";
$a->strings["Likes:"] = "Gefällt:";
$a->strings["Dislikes:"] = "Gefällt nicht:";
$a->strings["Contact information and Social Networks:"] = "Kontaktinformation und soziale Netzwerke:";
$a->strings["My other channels:"] = "Meine anderen Kanäle:";
$a->strings["Musical interests:"] = "Musikalische Interessen:";
$a->strings["Books, literature:"] = "Bücher, Literatur:";
$a->strings["Television:"] = "Fernsehen:";
$a->strings["Film/dance/culture/entertainment:"] = "Film/Tanz/Kultur/Unterhaltung:";
$a->strings["Love/Romance:"] = "Liebe/Romantik:";
$a->strings["Work/employment:"] = "Arbeit/Anstellung:";
$a->strings["School/education:"] = "Schule/Ausbildung:";
$a->strings["Like this thing"] = "Gefällt mir";
$a->strings["cover photo"] = "Cover Foto";
$a->strings["Some blurb about what to do when you're new here"] = "Ein Hinweis, was man tun kann, wenn man neu hier ist";
$a->strings["network"] = "Netzwerk";
$a->strings["RSS"] = "RSS";
@@ -1800,50 +1802,48 @@ $a->strings["Sexual Preference"] = "Sexuelle Orientierung";
$a->strings["Homepage"] = "Webseite";
$a->strings["Interests"] = "Hobbys/Interessen";
$a->strings["Profile updated."] = "Profil aktualisiert.";
$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Deine Kontaktliste vor Betrachtern dieses Profils verbergen?";
$a->strings["Hide your connections list from viewers of this profile"] = "Deine Verbindungen vor Betrachtern dieses Profils verbergen";
$a->strings["Edit Profile Details"] = "Bearbeite Profil-Details";
$a->strings["View this profile"] = "Dieses Profil ansehen";
$a->strings["Change Cover Photo"] = "Titelbild ändern";
$a->strings["Change Profile Photo"] = "Profilfoto ändern";
$a->strings["Change cover photo"] = "Titelbild ändern";
$a->strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen übernehmen";
$a->strings["Clone this profile"] = "Dieses Profil klonen";
$a->strings["Delete this profile"] = "Dieses Profil löschen";
$a->strings["Add profile things"] = "Sachen zum Profil hinzufügen";
$a->strings["Relation"] = "Beziehung";
$a->strings["Import profile from file"] = "Profil aus einer Datei importieren";
$a->strings["Export profile to file"] = "Profil in eine Datei exportieren";
$a->strings["Profile Name"] = "Profilname";
$a->strings["Your Full Name"] = "Dein voller Name";
$a->strings["Your gender"] = "Dein Geschlecht";
$a->strings["Marital status"] = "Familienstand";
$a->strings["Sexual preference"] = "Sexuelle Orientierung";
$a->strings["Profile name"] = "Profilname";
$a->strings["This is your default profile."] = "Das ist Dein Standardprofil.";
$a->strings["Your full name"] = "Dein voller Name";
$a->strings["Title/Description"] = "Titel/Beschreibung";
$a->strings["Your Gender"] = "Dein Geschlecht";
$a->strings["Birthday"] = "Geburtstag";
$a->strings["Street Address"] = "Straße und Hausnummer";
$a->strings["Street address"] = "Straße und Hausnummer";
$a->strings["Locality/City"] = "Wohnort";
$a->strings["Postal/Zip Code"] = "Postleitzahl";
$a->strings["Country"] = "Land";
$a->strings["Region/State"] = "Region/Bundesstaat";
$a->strings["<span class=\"heart\">&hearts;</span> Marital Status"] = "<span class=\"heart\">&hearts;</span> Beziehungsstatus";
$a->strings["Postal/Zip code"] = "Postleitzahl";
$a->strings["Country"] = "Land";
$a->strings["Who (if applicable)"] = "Wer (falls anwendbar)";
$a->strings["Examples: cathy123, Cathy Williams, [email protected]"] = "Beispiele: cathy123, Cathy Williams, [email protected]";
$a->strings["Since [date]"] = "Seit [Datum]";
$a->strings["Since (date)"] = "Seit (Datum)";
$a->strings["Tell us about yourself"] = "Erzähle uns ein wenig von Dir";
$a->strings["Hometown"] = "Heimatort";
$a->strings["Religious Views"] = "Religiöse Ansichten";
$a->strings["Political views"] = "Politische Ansichten";
$a->strings["Religious views"] = "Religiöse Ansichten";
$a->strings["Keywords used in directory listings"] = "Schlüsselwörter, die in Verzeichnis-Auflistungen verwendet werden";
$a->strings["Example: fishing photography software"] = "Beispiel: Angeln Fotografie Software";
$a->strings["Used in directory listings"] = "Wird in Verzeichnis-Auflistungen verwendet";
$a->strings["Tell us about yourself..."] = "Erzähle uns ein wenig von Dir …";
$a->strings["Hobbies/Interests"] = "Hobbys/Interessen";
$a->strings["Contact information and Social Networks"] = "Kontaktinformation und soziale Netzwerke";
$a->strings["My other channels"] = "Meine anderen Kanäle";
$a->strings["Musical interests"] = "Musikalische Interessen";
$a->strings["Books, literature"] = "Bücher, Literatur";
$a->strings["Television"] = "Fernsehen";
$a->strings["Film/dance/culture/entertainment"] = "Film/Tanz/Kultur/Unterhaltung";
$a->strings["Love/romance"] = "Liebe/Romantik";
$a->strings["Work/employment"] = "Arbeit/Anstellung";
$a->strings["School/education"] = "Schule/Ausbildung";
$a->strings["This is your default profile."] = "Das ist Dein Standardprofil.";
$a->strings["Age: "] = "Alter:";
$a->strings["Edit/Manage Profiles"] = "Profile bearbeiten/verwalten";
$a->strings["Add profile things"] = "Sachen zum Profil hinzufügen";
$a->strings["Include desirable objects in your profile"] = "Binde begehrenswerte Dinge in Dein Profil ein";
$a->strings["Film/Dance/Culture/Entertainment"] = "Film/Tanz/Kultur/Unterhaltung";
$a->strings["Hobbies/Interests"] = "Hobbys/Interessen";
$a->strings["Love/Romance"] = "Liebe/Romantik";
$a->strings["School/Education"] = "Schule/Ausbildung";
$a->strings["Contact information and social networks"] = "Kontaktinformation und soziale Netzwerke";
$a->strings["My other channels"] = "Meine anderen Kanäle";
$a->strings["Create New"] = "Ein neues erstellen";
$a->strings["Invalid profile identifier."] = "Ungültiger Profil-Identifikator";
$a->strings["Profile Visibility Editor"] = "Profil-Sichtbarkeits-Editor";
$a->strings["Click on a contact to add or remove."] = "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen.";
view/pdl/mod_locs.pdl
+4
View File
@@ -0,0 +1,4 @@
[region=aside]
[widget=settings_menu][/widget]
[/region]
view/pdl/mod_uexport.pdl
+4
View File
@@ -0,0 +1,4 @@
[region=aside]
[widget=settings_menu][/widget]
[/region]
view/tpl/channel.tpl
-4
View File
@@ -44,10 +44,6 @@
<i class="icon-user{{if $channel.intros != 0}} new-notification{{/if}}"></i>
{{if $channel.intros != 0}}<a href='manage/{{$channel.channel_id}}/connections/ifpending'>{{/if}}{{$channel.intros|string_format:$intros_format}}{{if $channel.intros != 0}}</a>{{/if}}
</div>
<div class="channel-link">
<i class="icon-map-marker"></i>
<a href="manage/{{$channel.channel_id}}/locs">{{$locs}}</a>
</div>
{{/if}}
</div>
</div>
view/tpl/locmanage.tpl
+40 -37
View File
@@ -1,38 +1,41 @@
<div class="generic-content-wrapper-styled">
<h2>{{$header}}</h2>
<script>
function primehub(id) {
$.post(baseurl + '/locs','primary='+id,function(data) { window.location.href=window.location.href; });
}
function drophub(id) {
$.post(baseurl + '/locs','drop='+id,function(data) { window.location.href=window.location.href; });
}
</script>
<div class="descriptive-text">{{$sync_text}}</div>
<br />
<div class="descriptive-text">{{$drop_text}}</div>
<div class="descriptive-text">{{$last_resort}}</div>
<br />
<table>
<tr><td>{{$loc}}</td><td>{{$mkprm}}</td><td>{{$drop}}</td></tr>
{{foreach $hubs as $hub}}
{{if ! $hub.deleted }}
<tr><td>
{{$hub.hubloc_url}} ({{$hub.hubloc_addr}})</td>
<td>
{{if $hub.primary}}<button class="btn btn-std"><i class="icon-check"></i></button>{{else}}<button class="btn btn-std" onclick="primehub({{$hub.hubloc_id}}); return false;" ><i class="icon-check-empty" ></i></button>{{/if}}
</td>
<td><button class="btn btn-std" onclick="drophub({{$hub.hubloc_id}}); return false;"><i class="icon-trash"></i></button></td>
</tr>
{{/if}}
{{/foreach}}
</table>
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<script>
function primehub(id) {
$.post(baseurl + '/locs','primary='+id,function(data) { window.location.href=window.location.href; });
}
function drophub(id) {
$.post(baseurl + '/locs','drop='+id,function(data) { window.location.href=window.location.href; });
}
</script>
<button class="btn btn-success btn-xs pull-right" onclick="window.location.href='/locs/f=&sync=1'; return false;"><i class="icon-refresh"></i>&nbsp;{{$sync}}</button>
<h2>{{$header}}</h2>
</div>
<div class="section-content-wrapper-np">
<div class="section-content-warning-wrapper">
{{$sync_text}}
</div>
<div class="section-content-info-wrapper">
{{$drop_text}}<br>
{{$last_resort}}
</div>
<table id="locs-index">
<tr>
<th>{{$addr}}</th>
<th class="hidden-xs">{{$loc}}</th>
<th>{{$mkprm}}</th>
<th>{{$drop}}</th>
</tr>
{{foreach $hubs as $hub}}
{{if ! $hub.deleted }}
<tr>
<td>{{$hub.hubloc_addr}}</td>
<td class="hidden-xs">{{$hub.hubloc_url}}</td>
<td>{{if $hub.primary}}<i class="icon-check"></i>{{else}}<i class="icon-check-empty primehub" onclick="primehub({{$hub.hubloc_id}}); return false;"></i>{{/if}}</td>
<td><i class="icon-trash drophub" onclick="drophub({{$hub.hubloc_id}}); return false;"></i></td>
</tr>
{{/if}}
{{/foreach}}
</table>
</div>
</div>
<div class="clear"></div>
<button class="btn btn-std" onclick="window.location.href='/locs/f=&sync=1'; return false;">{{$sync}}</button>