From 1fdac57d617bc16d3c784f8d6a2a82026b34b085 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 29 Apr 2016 09:58:44 +0200 Subject: jot: cleanup unused variables --- include/conversation.php | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 7d80b08fc..96207da8e 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1160,7 +1160,6 @@ function status_editor($a, $x, $popup = false) { $tpl = get_markup_template('jot-header.tpl'); App::$page['htmlhead'] .= replace_macros($tpl, array( - '$newpost' => 'true', '$baseurl' => z_root(), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), '$pretext' => ((x($x,'pretext')) ? $x['pretext'] : ''), @@ -1168,12 +1167,8 @@ function status_editor($a, $x, $popup = false) { '$nickname' => $x['nickname'], '$ispublic' => t('Visible to everybody'), '$linkurl' => t('Please enter a link URL:'), - '$vidurl' => t('Please enter a video link/URL:'), - '$audurl' => t('Please enter an audio link/URL:'), '$term' => t('Tag term:'), - '$fileas' => t('Save to Folder:'), '$whereareu' => t('Where are you right now?'), - '$expireswhen' => t('Expires YYYY-MM-DD HH:MM'), '$editor_autocomplete'=> ((x($x,'editor_autocomplete')) ? $x['editor_autocomplete'] : ''), '$bbco_autocomplete'=> ((x($x,'bbco_autocomplete')) ? $x['bbco_autocomplete'] : ''), )); @@ -1181,10 +1176,8 @@ function status_editor($a, $x, $popup = false) { $tpl = get_markup_template('jot.tpl'); $jotplugins = ''; - $jotnets = ''; $preview = t('Preview'); -// $preview = ((feature_enabled($x['profile_uid'],'preview')) ? t('Preview') : ''); if(x($x, 'nopreview')) $preview = ''; @@ -1201,7 +1194,6 @@ function status_editor($a, $x, $popup = false) { $cipher = 'aes256'; call_hooks('jot_tool', $jotplugins); - call_hooks('jot_networks', $jotnets); $o .= replace_macros($tpl, array( '$return_path' => ((x($x, 'return_path')) ? $x['return_path'] : App::$query_string), @@ -1218,42 +1210,25 @@ function status_editor($a, $x, $popup = false) { '$underline' => t('Underline'), '$quote' => t('Quote'), '$code' => t('Code'), - '$upload' => t('Upload photo'), - '$shortupload' => t('upload photo'), '$attach' => t('Attach file'), - '$shortattach' => t('attach file'), '$weblink' => t('Insert web link'), - '$shortweblink' => t('web link'), - '$video' => t('Insert video link'), - '$shortvideo' => t('video link'), - '$audio' => t('Insert audio link'), - '$shortaudio' => t('audio link'), '$setloc' => t('Set your location'), - '$shortsetloc' => t('set location'), '$voting' => t('Toggle voting'), '$feature_voting' => $voting, '$consensus' => 0, '$noloc' => ((get_pconfig($x['profile_uid'], 'system', 'use_browser_location')) ? t('Clear browser location') : ''), - '$shortnoloc' => t('clear location'), '$title' => ((x($x, 'title')) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8') : ''), '$placeholdertitle' => ((x($x, 'placeholdertitle')) ? $x['placeholdertitle'] : t('Title (optional)')), - '$hidetitle' => ((x($x, 'hidetitle')) ? $x['hidetitle'] : false), '$catsenabled' => ((feature_enabled($x['profile_uid'], 'categories') && (! $webpage)) ? 'categories' : ''), '$category' => "", '$placeholdercategory' => t('Categories (optional, comma-separated list)'), - '$wait' => t('Please wait'), '$permset' => t('Permission settings'), - '$shortpermset' => t('permissions'), '$ptyp' => '', '$content' => ((x($x,'body')) ? htmlspecialchars($x['body'], ENT_COMPAT,'UTF-8') : ''), '$attachment' => ((x($x, 'attachment')) ? $x['attachment'] : ''), '$post_id' => '', - '$baseurl' => z_root(), '$defloc' => $x['default_location'], '$visitor' => $x['visitor'], - '$public' => t('Public post'), - '$jotnets' => $jotnets, - '$emtitle' => t('Example: bob@example.com, mary@example.com'), '$lockstate' => $x['lockstate'], '$acl' => $x['acl'], '$mimeselect' => $mimeselect, -- cgit v1.2.3 From e01b90c4c62d0ad7484c05c5d848e5749617e820 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 29 Apr 2016 10:26:41 +0200 Subject: css fixes --- view/css/bootstrap-red.css | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 777bf69eb..aa8b40365 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -21,7 +21,7 @@ nav .badge { } } -nav i { +#navbar-collapse-1 i { font-size: 14px; } @@ -50,10 +50,6 @@ nav .navbar-collapse .navbar-right { float: right; } -nav .navbar-toggle { - margin-bottom: 7px; -} - /* nav overrides end */ -- cgit v1.2.3 From 49b957f7ea7ea8a1444a4e61a5b6a907acf32f10 Mon Sep 17 00:00:00 2001 From: sasiflo Date: Fri, 29 Apr 2016 11:39:00 +0200 Subject: Added german translation to context help. --- doc/context/de/admin/logs/help.html | 8 ++++++++ doc/context/de/admin/queue/help.html | 4 ++++ doc/context/de/admin/security/help.html | 4 ++++ doc/context/de/channel/help.html | 8 ++++++++ doc/context/de/chat/help.html | 8 ++++++++ doc/context/de/cloud/help.html | 6 ++++++ doc/context/de/connections/help.html | 8 ++++++++ doc/context/de/connections/ifpending/help.html | 8 ++++++++ doc/context/de/events/help.html | 8 ++++++++ doc/context/de/mail/help.html | 12 ++++++++++++ doc/context/de/network/help.html | 10 ++++++++++ doc/context/de/photos/help.html | 6 ++++++ doc/context/de/profile/help.html | 6 ++++++ 13 files changed, 96 insertions(+) create mode 100644 doc/context/de/admin/logs/help.html create mode 100644 doc/context/de/admin/queue/help.html create mode 100644 doc/context/de/admin/security/help.html create mode 100644 doc/context/de/channel/help.html create mode 100644 doc/context/de/chat/help.html create mode 100644 doc/context/de/cloud/help.html create mode 100644 doc/context/de/connections/help.html create mode 100644 doc/context/de/connections/ifpending/help.html create mode 100644 doc/context/de/events/help.html create mode 100644 doc/context/de/mail/help.html create mode 100644 doc/context/de/network/help.html create mode 100644 doc/context/de/photos/help.html create mode 100644 doc/context/de/profile/help.html diff --git a/doc/context/de/admin/logs/help.html b/doc/context/de/admin/logs/help.html new file mode 100644 index 000000000..1441d9075 --- /dev/null +++ b/doc/context/de/admin/logs/help.html @@ -0,0 +1,8 @@ +
+
Allgemein
+
Auf dieser Seite können die Einstellungen zur Protokollierung angepasst und vorhandene Protokolle angezeigt werden.
+
Protokoll Einstellungen
+
Bei aktivierter Debugging-Option werden System-Log Informationen an die Datei in der Protokolldatei im EIngabefeld hinzugefügt. Der Pfad ist relativ zum Hub-Wurzelverzeichnis. Daauf achten, dass diese Datei vom Webserver geschrieben werden kann.
+
Protokollstufe
+
Die Protokollstufe bestimmt, wie viele Informationen an die Protokolldatei angefügt werden. Warnung: Eine hohe Protokollstufe kann sehr schnell die Größe der Protokolldatei anwachsen lassen, vor allem, wenn der Hub viele Mitglieder hat.
+
diff --git a/doc/context/de/admin/queue/help.html b/doc/context/de/admin/queue/help.html new file mode 100644 index 000000000..e59fdcaee --- /dev/null +++ b/doc/context/de/admin/queue/help.html @@ -0,0 +1,4 @@ +
+
Allgemein
+
Die Warteschlangenstatistik zeigt, wie viele Nachrichten zur Auslieferung an andere Hubs noch in der Warteschlange stehen. Die Priorität steht in Beziehung mit der Anzahl fehlgeschlagener Auslieferungsversuche.
+
diff --git a/doc/context/de/admin/security/help.html b/doc/context/de/admin/security/help.html new file mode 100644 index 000000000..6465e8f0e --- /dev/null +++ b/doc/context/de/admin/security/help.html @@ -0,0 +1,4 @@ +
+
Allgemein
+
Auf dieser Seite können verschiedene Sicherheitseinstellungen vorgenommen werden. Um geänderte Einstellungen zu speichern, muss der Knopf "Bestätigen" gedrückt werden.
+
diff --git a/doc/context/de/channel/help.html b/doc/context/de/channel/help.html new file mode 100644 index 000000000..fbfcac3c1 --- /dev/null +++ b/doc/context/de/channel/help.html @@ -0,0 +1,8 @@ +
+
Allgemein
+
Auf dieser Seite wird der eigene aktuelle Kanal angezeigt. Dies entspricht ungefähr den Profilseiten in anderen sozialen Netzwerken. Im Kanal veröffentliche Beiträge werden gemäß den Anzeige-Berechtigungen des Betrachters angezeigt.
+
Beitrag anlegen
+
Falls der Betrachter/Besucher die Berechtigung zum Anlegen von Beiträgen besitzt, wird im oberen Bereich der Beitragseditor angezeigt.
+
Kanal-Inhalte-Tabs
+
Die Tabs für unterschiedliche Kanal-Inhalte zeigen die unterschiedlichen veröffentlichten Inhalte des Kanals an. The Über Tab verweist auf das Profil des Kanals. Der Fotos Tab verweist auf die Foto-Gallerien des Kanals. Der Dateien Tab verweist auf allgemeine vom Kanal veröffentlichte und geteilte Dateien.
+
diff --git a/doc/context/de/chat/help.html b/doc/context/de/chat/help.html new file mode 100644 index 000000000..ba355365f --- /dev/null +++ b/doc/context/de/chat/help.html @@ -0,0 +1,8 @@ +
+
Allgemein
+
Chaträume können angelegt und für die Echtzeit-Kommunikation verwendet werden. Die Zugriffskontrolle verwendet dabei das Hubzilla-Berechtigungssystem.
+
Chatraum anlegen
+
Über den Knopf "Neu anlegen" wird ein neuer Chatraum eröffnet. Hierfür einen Namen und angeben, wie lange Nachrichten aufbewahrt werden sollen.
+
Chatten
+
Die Nachricht in der der Nachrichtenbox eingeben und "Bestätigen" drücken. Über den Menüknopf neben "Bestätigen" kann ein Anwesenheitsstatus gesetzt werden. Andere Teilnehmer am Chatraum werden im Seitenpanel unter "Chatmitglieder" angezeigt.
+
diff --git a/doc/context/de/cloud/help.html b/doc/context/de/cloud/help.html new file mode 100644 index 000000000..e72ad1743 --- /dev/null +++ b/doc/context/de/cloud/help.html @@ -0,0 +1,6 @@ +
+
Allgemein
+
Diese Seite zeigt die veröffentlichten und geteilten Dateien des Kanals an. Welche Dateien ein Besucher sehen kann, wird über die individuellen Dateiberechtigungen bestimmt, die vom Kanal-Besitzer bestimmt werden. Wurde die Berechtigung zum Anlegen/Hochladen von Dateien vergeben, werden die entsprechenden Steuerungsknöpfe angezeigt.
+
Kanal-Inhalte-Tabs
+
Die Tabs für unterschiedliche Kanal-Inhalte zeigen die unterschiedlichen veröffentlichten Inhalte des Kanals an. The Über Tab verweist auf das Profil des Kanals. Der Fotos Tab verweist auf die Foto-Gallerien des Kanals. Der Dateien Tab verweist auf allgemeine vom Kanal veröffentlichte und geteilte Dateien.
+
diff --git a/doc/context/de/connections/help.html b/doc/context/de/connections/help.html new file mode 100644 index 000000000..61789ea38 --- /dev/null +++ b/doc/context/de/connections/help.html @@ -0,0 +1,8 @@ +
+
Allgemein
+
Auf dieser Seite werden die Verbindungen des Kanals angezeigt. Diese Liste kann sortiert und gefilter werden über den Menüknopf neben dem Suchknopf.
+
Verbindungsdetails
+
Jeder Eintrag in der Liste zeigt die Details einer Verbindung. Ein durchsichtiges (ausgegrautes) Avatar-Bild zeigt archivierte Verbindungen an (diese konnten min. 30 Tage nicht erreicht werden).
+
Verbindungsstatus
+
Eine Verbindung kann sich in verschiedenen Stati befinden:
  • Archiviert
  • Ignoriert
  • Blockiert
  • Versteckt
+
diff --git a/doc/context/de/connections/ifpending/help.html b/doc/context/de/connections/ifpending/help.html new file mode 100644 index 000000000..3e55b34c3 --- /dev/null +++ b/doc/context/de/connections/ifpending/help.html @@ -0,0 +1,8 @@ +
+
Allgemein
+
Auf dieser Seite werden Verbindungswünsche von anderen Kanälen an diesen Kanal angezeigt. Diese Liste kann sortiert und gefilter werden über den Menüknopf neben dem Suchknopf.
+
Verbindungsdetails
+
Jeder Eintrag in der Liste zeigt die Details einer Verbindung. Ein durchsichtiges (ausgegrautes) Avatar-Bild zeigt archivierte Verbindungen an (diese konnten min. 30 Tage nicht erreicht werden).
+
Verbindungsstatus
+
Eine Verbindung kann sich in verschiedenen Stati befinden:
  • Archiviert
  • Ignoriert
  • Blockiert
  • Versteckt
+
diff --git a/doc/context/de/events/help.html b/doc/context/de/events/help.html new file mode 100644 index 000000000..b0dc95b3e --- /dev/null +++ b/doc/context/de/events/help.html @@ -0,0 +1,8 @@ +
+
Allgemein
+
Auf dieser Seite wird ein Kalender mit eigenen und von anderen verbundenen Kanälen geteilte Ereignisse angezeigt.
+
Kalenderanzeige
+
Die Monats-, Wochen- und Tagesansicht des Kalenders kann im Panel ausgewählt werden.
+
Export/Import
+
Kalendereinträge können Eim Standard-Format iCalendar (.ics) exportiert oder importiert werden.
+
diff --git a/doc/context/de/mail/help.html b/doc/context/de/mail/help.html new file mode 100644 index 000000000..b89135d8c --- /dev/null +++ b/doc/context/de/mail/help.html @@ -0,0 +1,12 @@ +
+
Allgemein
+
Die Privaten Nachrichten sind nur für den Kanal-Besitzer und den Empfänger sichtbar.
+
Konversationen
+
Über Konversationen kann eine vollständige fortlaufene Ansicht einer Konversation angezeigt werden. Verfügbare Konversationen werden unter dem Punkt Konversationen im Panel angezeigt.
+
Eingang/Ausgang
+
Einzelne versandte Nachrichten kännen über den Punkt Ausgang und empfangene Nachrichten über Eingang gefiltert dargestellt werden.
+
Neue Nachricht
+
Über Neue Nachricht kann eine neue Nachricht erstellt werden.
+
Sonstiges
+
Über das Menü einzelner Nachrichten können besondere Funktionen ausgelöst werden: Zustellungsbericht kann abgerufen werden, Nachrichten (die noch nicht angesehen wurden!) können widerrufen und gelöscht werden.
+
diff --git a/doc/context/de/network/help.html b/doc/context/de/network/help.html new file mode 100644 index 000000000..6590f597d --- /dev/null +++ b/doc/context/de/network/help.html @@ -0,0 +1,10 @@ +
+
Allgemein
+
Auf der Netzwerkseite wird der Strom von Beiträgen und Konversationen angezeigt. Typischerweise wird nach kürzlich aktualisierten Beiträgen sortiert. Diese Seite kann sehr weitgehend angepasst werden.
+
Beitrag anlegen
+
Im oberen Bereich der Seite wird eine Textbox "Teilen" angezeigt. Nach Klick in diese Box wird der Beitragseditor angezeigt. Der Beitragseditor kann angepasst werden; in den Basiseinstellungen stehen Felder für Inhalt und einem optionalen Titel bereit. Knöpfe unterhalb des Inhaltes erleichtern die Eingabe von Formatierungen, Links, Bildern und anderen Daten im Beitrag. Über die Knöpfe im rechten Bereich kann eine Vorschau aktiviert, Berechtigungen gesetzt und der Beitrag abgesendet werden.
+
Gruppen
+
Die erstellten Gruppen werden im Panel angezeigt. Über die Gruppen kann nach Beiträgen von Gruppenmitgliedern gefiltert werden.
+
Beitragsberechtigungen
+
Die Zugriffskontrollliste (Access Control List; ACL) steuert, wer den Beitrag sehen darf. Nach Klick auf das Schloß neben dem Knopf "Teilen" öffnet sich ein Dialog, in dem Kanäle oder Gruppen ausgewählt werdenkönnen, die diesen Beitrag sehen dürfen. s kann auch gezielt verboten werden, dass ein Kanal oder eine Gruppe den Artikel sehen darf (nützlich beispielsweise für die Planung einer Überraschungsparty in einer Gruppe, in der der Überraschte Mitglied ist).
+
diff --git a/doc/context/de/photos/help.html b/doc/context/de/photos/help.html new file mode 100644 index 000000000..437d2c369 --- /dev/null +++ b/doc/context/de/photos/help.html @@ -0,0 +1,6 @@ +
+
Allgemein
+
Diese Seite zeigt die veröffentlichten und geteilten Fotos des Kanals an. Welche Fotos ein Besucher sehen kann, wird über die individuellen Berechtigungen bestimmt, die vom Kanal-Besitzer bestimmt werden. Wurde die Berechtigung zum Anlegen/Hochladen von Bildern vergeben, werden die entsprechenden Steuerungsknöpfe angezeigt.
+
Kanal-Inhalte-Tabs
+
Die Tabs für unterschiedliche Kanal-Inhalte zeigen die unterschiedlichen veröffentlichten Inhalte des Kanals an. The Über Tab verweist auf das Profil des Kanals. Der Fotos Tab verweist auf die Foto-Gallerien des Kanals. Der Dateien Tab verweist auf allgemeine vom Kanal veröffentlichte und geteilte Dateien.
+
diff --git a/doc/context/de/profile/help.html b/doc/context/de/profile/help.html new file mode 100644 index 000000000..ece33457d --- /dev/null +++ b/doc/context/de/profile/help.html @@ -0,0 +1,6 @@ +
+
Allgemein
+
Dies ist die Profilseite eines Kanals. Hier werden typischerweise Informationen angezeigt, die den Kanal beschreiben. Wenn der Kanal beispielsweise eine Person in einem sozialen Netzwerk repräsentiert, könnten Kontaktinformationen und andere persönliche Details hier veröffentlicht werden. Kanäle können mehrere Profile besitzen, die abhängig vom Betrachter/Besucher angezeigt werden.
+
Kanal-Inhalte-Tabs
+
Die Tabs für unterschiedliche Kanal-Inhalte zeigen die unterschiedlichen veröffentlichten Inhalte des Kanals an. The Über Tab verweist auf das Profil des Kanals. Der Fotos Tab verweist auf die Foto-Gallerien des Kanals. Der Dateien Tab verweist auf allgemeine vom Kanal veröffentlichte und geteilte Dateien.
+
-- cgit v1.2.3 From b797528b78107b707dc1c56d70e07136d7c31028 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 29 Apr 2016 13:18:42 +0200 Subject: some work on making mod editpost use status_editor() - if you find anything related to jot broken please revert this commit --- Zotlabs/Module/Editpost.php | 115 +++++++++++--------------------------------- include/conversation.php | 42 ++++++++++------ view/js/mod_settings.js | 2 +- view/tpl/jot.tpl | 10 ++-- 4 files changed, 60 insertions(+), 109 deletions(-) diff --git a/Zotlabs/Module/Editpost.php b/Zotlabs/Module/Editpost.php index d8b971f6c..fd9912fe9 100644 --- a/Zotlabs/Module/Editpost.php +++ b/Zotlabs/Module/Editpost.php @@ -5,7 +5,7 @@ require_once('include/acl_selectors.php'); require_once('include/crypto.php'); require_once('include/items.php'); require_once('include/taxonomy.php'); - +require_once('include/conversation.php'); class Editpost extends \Zotlabs\Web\Controller { @@ -49,20 +49,7 @@ class Editpost extends \Zotlabs\Web\Controller { // $plaintext = false; $channel = \App::get_channel(); - - \App::$page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( - '$baseurl' => z_root(), - '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), - '$pretext' => '', - '$ispublic' => ' ', // t('Visible to everybody'), - '$geotag' => $geotag, - '$nickname' => $channel['channel_address'], - '$expireswhen' => t('Expires YYYY-MM-DD HH:MM'), - '$confirmdelete' => t('Delete item?'), - '$editor_autocomplete'=> true, - '$bbco_autocomplete'=> 'bbcode' - )); - + if(intval($itm[0]['item_obscured'])) { $key = get_config('system','prvkey'); if($itm[0]['title']) @@ -71,18 +58,6 @@ class Editpost extends \Zotlabs\Web\Controller { $itm[0]['body'] = crypto_unencapsulate(json_decode_plus($itm[0]['body']),$key); } - $tpl = get_markup_template("jot.tpl"); - - $jotplugins = ''; - $jotnets = ''; - - call_hooks('jot_tool', $jotplugins); - call_hooks('jot_networks', $jotnets); - - //$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); - - $voting = feature_enabled($owner_uid,'consensus_tools'); - $category = ''; $catsenabled = ((feature_enabled($owner_uid,'categories')) ? 'categories' : ''); @@ -106,66 +81,32 @@ class Editpost extends \Zotlabs\Web\Controller { } } } - - $cipher = get_pconfig(\App::$profile['profile_uid'],'system','default_cipher'); - if(! $cipher) - $cipher = 'aes256'; - - - $editor = replace_macros($tpl,array( - '$return_path' => $_SESSION['return_url'], - '$action' => 'item', - '$share' => t('Edit'), - '$bold' => t('Bold'), - '$italic' => t('Italic'), - '$underline' => t('Underline'), - '$quote' => t('Quote'), - '$code' => t('Code'), - '$upload' => t('Upload photo'), - '$attach' => t('Attach file'), - '$weblink' => t('Insert web link'), - '$youtube' => t('Insert YouTube video'), - '$video' => t('Insert Vorbis [.ogg] video'), - '$audio' => t('Insert Vorbis [.ogg] audio'), - '$setloc' => t('Set your location'), - '$noloc' => t('Clear browser location'), - '$voting' => t('Toggle voting'), - '$feature_voting' => $voting, - '$consensus' => intval($itm[0]['item_consensus']), - '$wait' => t('Please wait'), - '$permset' => t('Permission settings'), - '$ptyp' => $itm[0]['obj_type'], - '$content' => undo_post_tagging($itm[0]['body']), - '$post_id' => $post_id, - '$parent' => (($itm[0]['parent'] != $itm[0]['id']) ? $itm[0]['parent'] : ''), - '$baseurl' => z_root(), - '$defloc' => $channel['channel_location'], - '$visitor' => false, - '$public' => t('Public post'), - '$jotnets' => $jotnets, - '$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'), - '$placeholdertitle' => t('Title (optional)'), - '$category' => $category, - '$placeholdercategory' => t('Categories (optional, comma-separated list)'), - '$emtitle' => t('Example: bob@example.com, mary@example.com'), - '$lockstate' => $lockstate, - '$acl' => '', - '$bang' => '', - '$profile_uid' => $owner_uid, - '$preview' => t('Preview'), - '$jotplugins' => $jotplugins, - '$sourceapp' => t(\App::$sourcename), - '$catsenabled' => $catsenabled, - '$defexpire' => datetime_convert('UTC', date_default_timezone_get(),$itm[0]['expires']), - '$feature_expire' => ((feature_enabled(\App::$profile['profile_uid'],'content_expire') && (! $webpage)) ? true : false), - '$expires' => t('Set expiration date'), - '$feature_encrypt' => ((feature_enabled(\App::$profile['profile_uid'],'content_encrypt') && (! $webpage)) ? true : false), - '$encrypt' => t('Encrypt text'), - '$cipher' => $cipher, - '$expiryModalOK' => t('OK'), - '$expiryModalCANCEL' => t('Cancel'), - '$bbcode' => true - )); + + $x = array( + 'ispublic' => ' ', + 'nickname' => $channel['channel_address'], + 'editor_autocomplete'=> true, + 'bbco_autocomplete'=> 'bbcode', + 'return_path' => $_SESSION['return_url'], + 'button' => t('Edit'), + 'hide_voting' => true, + 'hide_future' => true, + 'hide_location' => true, + 'ptyp' => $itm[0]['obj_type'], + 'body' => undo_post_tagging($itm[0]['body']), + 'post_id' => $post_id, + 'defloc' => $channel['channel_location'], + 'visitor' => true, + 'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'), + 'category' => $category, + 'showacl' => false, + 'profile_uid' => $owner_uid, + 'catsenabled' => $catsenabled, + 'hide_expire' => true, + 'bbcode' => true + ); + + $editor = status_editor($a, $x); $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( '$title' => t('Edit post'), diff --git a/include/conversation.php b/include/conversation.php index 96207da8e..14fee19b2 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1115,16 +1115,28 @@ function status_editor($a, $x, $popup = false) { if($c && $c['channel_moved']) return $o; - $geotag = (($x['allow_location']) ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : ''); - $plaintext = true; // if(feature_enabled(local_channel(),'richtext')) // $plaintext = false; - $voting = feature_enabled(local_channel(), 'consensus_tools'); - if(x($x, 'novoting')) - $voting = false; + $feature_voting = feature_enabled($x['profile_uid'], 'consensus_tools'); + if(x($x, 'hide_voting')) + $feature_voting = false; + + $feature_expire = ((feature_enabled($x['profile_uid'], 'content_expire') && (! $webpage)) ? true : false); + if(x($x, 'hide_expire')) + $feature_expire = false; + + $feature_future = ((feature_enabled($x['profile_uid'], 'delayed_posting') && (! $webpage)) ? true : false); + if(x($x, 'hide_future')) + $feature_future = false; + + $geotag = (($x['allow_location']) ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : ''); + $setloc = t('Set your location'); + $clearloc = ((get_pconfig($x['profile_uid'], 'system', 'use_browser_location')) ? t('Clear browser location') : ''); + if(x($x, 'hide_location')) + $geotag = $setloc = $clearloc = ''; $mimeselect = ''; if(array_key_exists('mimetype', $x) && $x['mimetype']) { @@ -1146,7 +1158,6 @@ function status_editor($a, $x, $popup = false) { $layoutselect = ''; } - if(array_key_exists('channel_select',$x) && $x['channel_select']) { require_once('include/identity.php'); $id_select = identity_selector(); @@ -1154,7 +1165,6 @@ function status_editor($a, $x, $popup = false) { else $id_select = ''; - $webpage = ((x($x,'webpage')) ? $x['webpage'] : ''); $tpl = get_markup_template('jot-header.tpl'); @@ -1165,7 +1175,7 @@ function status_editor($a, $x, $popup = false) { '$pretext' => ((x($x,'pretext')) ? $x['pretext'] : ''), '$geotag' => $geotag, '$nickname' => $x['nickname'], - '$ispublic' => t('Visible to everybody'), + '$ispublic' => ((x($x,'ispublic')) ? $x['ispublic'] : t('Visible to everybody')), '$linkurl' => t('Please enter a link URL:'), '$term' => t('Tag term:'), '$whereareu' => t('Where are you right now?'), @@ -1212,21 +1222,21 @@ function status_editor($a, $x, $popup = false) { '$code' => t('Code'), '$attach' => t('Attach file'), '$weblink' => t('Insert web link'), - '$setloc' => t('Set your location'), + '$setloc' => $setloc, '$voting' => t('Toggle voting'), - '$feature_voting' => $voting, + '$feature_voting' => $feature_voting, '$consensus' => 0, - '$noloc' => ((get_pconfig($x['profile_uid'], 'system', 'use_browser_location')) ? t('Clear browser location') : ''), + '$clearloc' => $clearloc, '$title' => ((x($x, 'title')) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8') : ''), '$placeholdertitle' => ((x($x, 'placeholdertitle')) ? $x['placeholdertitle'] : t('Title (optional)')), '$catsenabled' => ((feature_enabled($x['profile_uid'], 'categories') && (! $webpage)) ? 'categories' : ''), - '$category' => "", + '$category' => ((x($x, 'category')) ? $x['category'] : ''), '$placeholdercategory' => t('Categories (optional, comma-separated list)'), '$permset' => t('Permission settings'), - '$ptyp' => '', + '$ptyp' => ((x($x, 'ptyp')) ? $x['ptyp'] : ''), '$content' => ((x($x,'body')) ? htmlspecialchars($x['body'], ENT_COMPAT,'UTF-8') : ''), '$attachment' => ((x($x, 'attachment')) ? $x['attachment'] : ''), - '$post_id' => '', + '$post_id' => ((x($x, 'post_id')) ? $x['post_id'] : ''), '$defloc' => $x['default_location'], '$visitor' => $x['visitor'], '$lockstate' => $x['lockstate'], @@ -1240,10 +1250,10 @@ function status_editor($a, $x, $popup = false) { '$source' => ((x($x, 'source')) ? $x['source'] : ''), '$jotplugins' => $jotplugins, '$defexpire' => $defexpire, - '$feature_expire' => ((feature_enabled($x['profile_uid'], 'content_expire') && (! $webpage)) ? true : false), + '$feature_expire' => $feature_expire, '$expires' => t('Set expiration date'), '$defpublish' => $defpublish, - '$feature_future' => ((feature_enabled($x['profile_uid'], 'delayed_posting') && (! $webpage)) ? true : false), + '$feature_future' => $feature_future, '$future_txt' => t('Set publish date'), '$feature_encrypt' => ((feature_enabled($x['profile_uid'], 'content_encrypt') && (! $webpage)) ? true : false), '$encrypt' => t('Encrypt text'), diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js index e28a18b9f..3fd57995a 100644 --- a/view/js/mod_settings.js +++ b/view/js/mod_settings.js @@ -127,4 +127,4 @@ function channel_privacy_macro(n) { $('#id_profile_in_directory_onoff .off').addClass('hidden'); $('#id_profile_in_directory').val(1); } -} \ No newline at end of file +} diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 9c5ddc620..34952596a 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -86,8 +86,8 @@ {{/if}} - {{if $noloc}} - {{/if}} @@ -115,7 +115,7 @@ {{/if}} - {{if $writefiles || $weblink || $setloc || $noloc || $feature_expire || $feature_encrypt || $feature_voting}} + {{if $writefiles || $weblink || $setloc || $clearloc || $feature_expire || $feature_encrypt || $feature_voting}}
diff --git a/library/font_awesome/src/_includes/ads/carbon-light-horizontal.html b/library/font_awesome/src/_includes/ads/carbon-light-horizontal.html deleted file mode 100644 index 8dcfb61b6..000000000 --- a/library/font_awesome/src/_includes/ads/carbon-light-horizontal.html +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/library/font_awesome/src/_includes/ads/carbon-light-vertical.html b/library/font_awesome/src/_includes/ads/carbon-light-vertical.html deleted file mode 100644 index e6fce26a9..000000000 --- a/library/font_awesome/src/_includes/ads/carbon-light-vertical.html +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/library/font_awesome/src/_includes/ads/fusion.html b/library/font_awesome/src/_includes/ads/fusion.html new file mode 100644 index 000000000..c49a9f42c --- /dev/null +++ b/library/font_awesome/src/_includes/ads/fusion.html @@ -0,0 +1 @@ + diff --git a/library/font_awesome/src/_includes/brand-adblock-warning.html b/library/font_awesome/src/_includes/brand-adblock-warning.html new file mode 100644 index 000000000..9f4ddd8b6 --- /dev/null +++ b/library/font_awesome/src/_includes/brand-adblock-warning.html @@ -0,0 +1,5 @@ +

Warning!

+Apparently, Adblock Plus can remove Font Awesome brand icons with their "Remove Social +Media Buttons" setting. We will not use hacks to force them to display. Please +report an issue with Adblock Plus if you believe this to be +an error. To work around this, you'll need to modify the social icon class names. diff --git a/library/font_awesome/src/_includes/brand-license.html b/library/font_awesome/src/_includes/brand-license.html index 07dea295a..79696801e 100644 --- a/library/font_awesome/src/_includes/brand-license.html +++ b/library/font_awesome/src/_includes/brand-license.html @@ -1,4 +1,5 @@ -
    +
    • All brand icons are trademarks of their respective owners.
    • The use of these trademarks does not indicate endorsement of the trademark holder by Font Awesome, nor vice versa.
    • +
    • Brand icons should only be used to represent the company or product to which they refer.
    diff --git a/library/font_awesome/src/_includes/cheatsheet.html b/library/font_awesome/src/_includes/cheatsheet.html deleted file mode 100644 index 81e508c45..000000000 --- a/library/font_awesome/src/_includes/cheatsheet.html +++ /dev/null @@ -1,19 +0,0 @@ -{% capture stripe_ad_content %} -

    - Print this page to PDF for the complete set of vectors. Or to use on the desktop, install FontAwesome.otf and copy - and paste the icons (not the unicode) directly into your designs. -

    -{% endcapture %} -{% include stripe-ad.html %} - - - -
    -{% for icon in icons %} -
    - &#x{{ icon.unicode }} - icon-{{ icon.id }} - (&#x{{ icon.unicode }};) -
    -{% endfor %} -
    diff --git a/library/font_awesome/src/_includes/code/core.less b/library/font_awesome/src/_includes/code/core.less new file mode 100644 index 000000000..cbd0d1ae7 --- /dev/null +++ b/library/font_awesome/src/_includes/code/core.less @@ -0,0 +1,6 @@ + display: inline-block; + font: normal normal normal @fa-font-size-base/@fa-line-height-base FontAwesome; // shortening font declaration + font-size: inherit; // can't have font-size inherit on line above, so need to override + text-rendering: auto; // optimizelegibility throws things off #1094 + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; diff --git a/library/font_awesome/src/_includes/code/core.scss b/library/font_awesome/src/_includes/code/core.scss new file mode 100644 index 000000000..c7ea6e0e3 --- /dev/null +++ b/library/font_awesome/src/_includes/code/core.scss @@ -0,0 +1,6 @@ + display: inline-block; + font: normal normal normal #{$fa-font-size-base}/#{$fa-line-height-base} FontAwesome; // shortening font declaration + font-size: inherit; // can't have font-size inherit on line above, so need to override + text-rendering: auto; // optimizelegibility throws things off #1094 + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; diff --git a/library/font_awesome/src/_includes/code/license.css b/library/font_awesome/src/_includes/code/license.css new file mode 100644 index 000000000..7e503a805 --- /dev/null +++ b/library/font_awesome/src/_includes/code/license.css @@ -0,0 +1,4 @@ +/*! + * Font Awesome {{ site.fontawesome.version }} by @{{ site.fontawesome.author.twitter }} - {{ site.fontawesome.url }} - @{{ site.fontawesome.twitter }} + * License - {{ site.fontawesome.url }}/license (Font: {{ site.fontawesome.license.font.version }}, CSS: {{ site.fontawesome.license.code.version }}) + */ \ No newline at end of file diff --git a/library/font_awesome/src/_includes/community.html b/library/font_awesome/src/_includes/community.html deleted file mode 100644 index f6ba9f060..000000000 --- a/library/font_awesome/src/_includes/community.html +++ /dev/null @@ -1,20 +0,0 @@ -{% capture stripe_ad_content %} -

    - Font Awesome has a vibrant community of folks helping each other out. You can - get support, - report bugs, - request new icons, - submit pull requests, and - check upcoming milestones. -

    -{% endcapture %} -{% include stripe-ad.html %} - -{% include community/getting-support.html %} -{% include community/reporting-bugs.html %} -{% include community/requesting-new-icons.html %} -{% include community/submitting-pull-requests.html %} -{% include community/project-milestones.html %} - -{% include thanks-to.html %} -{% include tell-me-thanks.html %} diff --git a/library/font_awesome/src/_includes/community/project-milestones.html b/library/font_awesome/src/_includes/community/project-milestones.html index ba2a4e493..598569981 100644 --- a/library/font_awesome/src/_includes/community/project-milestones.html +++ b/library/font_awesome/src/_includes/community/project-milestones.html @@ -2,6 +2,6 @@

    Want to keep up with what's planned for Font Awesome? Check out our - milestones on the GitHub project. + milestones on the GitHub project.

    diff --git a/library/font_awesome/src/_includes/community/reporting-bugs.html b/library/font_awesome/src/_includes/community/reporting-bugs.html index 3dde63fa5..b8fb61e49 100644 --- a/library/font_awesome/src/_includes/community/reporting-bugs.html +++ b/library/font_awesome/src/_includes/community/reporting-bugs.html @@ -5,7 +5,7 @@

    1. Please be nice. Font Awesome is a happy place.
    2. -
    3. Please search to see if your icon request already exists.
    4. +
    5. Please search to see if your bug was already reported.
    6. Before opening any issue, please read the generic issue guidelines, by Nicolas Gallagher. diff --git a/library/font_awesome/src/_includes/community/requesting-new-icons.html b/library/font_awesome/src/_includes/community/requesting-new-icons.html index d710e2bb1..e73f41c35 100644 --- a/library/font_awesome/src/_includes/community/requesting-new-icons.html +++ b/library/font_awesome/src/_includes/community/requesting-new-icons.html @@ -7,21 +7,23 @@

      1. Please be nice. Font Awesome is a happy place.
      2. -
      3. Please search to see if your icon request already exists.
      4. +
      5. Please search to see if your icon request already exists. If a request is found, please +1 that one.
      6. +
      7. + Please make requests for single icons, unless you are requesting a couple of strictly related icons (e.g., thumbs-up/thumbs-down). +
      8. Please and thank you if you include the following:
        • - Title your new issue - Icon request: icon-name. + Title your new issue + Icon request: icon-name (e.g., Icon request: icon-car).
        • Include a few use cases for your requested icon. How do you plan on using it?
        • Attach a single color image or two that represent the idea you're going for.
      9. - Concrete objects make good icons, since abstract concepts are, well, abstract. It's harder to make an icon - to represent happiness. It's easier to make a smiley face. + Request concrete objects: it's harder to make an icon to represent happiness, it's easier to make a smiley face.
      diff --git a/library/font_awesome/src/_includes/community/submitting-pull-requests.html b/library/font_awesome/src/_includes/community/submitting-pull-requests.html index de79930e6..1a55aba7b 100644 --- a/library/font_awesome/src/_includes/community/submitting-pull-requests.html +++ b/library/font_awesome/src/_includes/community/submitting-pull-requests.html @@ -2,8 +2,9 @@ Found a way to solve a bug in Font Awesome? Want to contribute new features? Here are a few things to remember:
        +
      1. Please do not submit new icons.
      2. Please submit all pull requests against *-wip branches.
      3. -
      4. All pull requests submitted against master will be sumarily closed and this guide referenced.
      5. +
      6. All pull requests submitted against master will be summarily closed and this guide referenced.
      7. After doing everything above, feel free to submit a pull request. diff --git a/library/font_awesome/src/_includes/examples.html b/library/font_awesome/src/_includes/examples.html deleted file mode 100644 index 0598e28be..000000000 --- a/library/font_awesome/src/_includes/examples.html +++ /dev/null @@ -1,24 +0,0 @@ -{% capture stripe_ad_content %} -

        - After you get up and running, you can place Font Awesome icons just about - anywhere with the <i> tag. - Many examples appreciatively re-used from the Bootstrap documentation. -

        -{% endcapture %} -{% include stripe-ad.html %} - -{% include examples/new.html %} - -{% include examples/inline-icons.html %} -{% include examples/larger-icons.html %} -{% include examples/bordered-pulled.html %} -{% include examples/buttons.html %} -{% include examples/button-groups.html %} -{% include examples/button-dropdowns.html %} -{% include examples/bulleted-lists.html %} -{% include examples/navigation.html %} -{% include examples/form-inputs.html %} -{% include examples/animated-spinner.html %} -{% include examples/rotated-flipped.html %} -{% include examples/stacked.html %} -{% include examples/custom.html %} diff --git a/library/font_awesome/src/_includes/examples/accessible.html b/library/font_awesome/src/_includes/examples/accessible.html new file mode 100644 index 000000000..2f51aed9c --- /dev/null +++ b/library/font_awesome/src/_includes/examples/accessible.html @@ -0,0 +1,109 @@ +
        + +
        +
        +

        + + + Settings + + + + + Delete + + + + + Skip to main navigation + +

        + +

        + + Refreshing... + + + Saving. Hang tight! +

        + +

        +

        + + +
        +
        + + +
        +

        + +

        + + + View 3 items in your shopping cart + +

        + +

        + + Battery level: 50% +

        +
        +
        +

        + With our thoughts on icon accessibility in mind, If an icon only adds some extra decoration or branding, it does not need to be announced to users as they are navigating your site or app aurally. Alternatively, if an icon conveys meaning in your content or interface, ensure that this meaning is also conveyed to assistive technologies through alternative displays or text. +

        + +{% highlight html %} + + + Settings + + + + + Delete + + + + + Skip to main navigation + +{% endhighlight %} + +{% highlight html %} + +Refreshing... + + +Saving. Hang tight! +{% endhighlight %} + +{% highlight html %} +
        + + +
        +
        + + +
        +{% endhighlight %} + +{% highlight html %} + + + View 3 items in your shopping cart + +{% endhighlight %} + +{% highlight html %} + +Battery level: 50% +{% endhighlight %} +
        +
        +
        diff --git a/library/font_awesome/src/_includes/examples/animated-spinner.html b/library/font_awesome/src/_includes/examples/animated-spinner.html deleted file mode 100644 index eee013a11..000000000 --- a/library/font_awesome/src/_includes/examples/animated-spinner.html +++ /dev/null @@ -1,20 +0,0 @@ -
        - -
        -
        - Use the icon-spin class to get any icon to rotate. Works well with icon-spinner and - icon-refresh. -
        -
        -
        - Spinner icon when loading content... -
        -{% highlight html %} - Spinner icon when loading content... -{% endhighlight %} -

        - CSS3 animations aren't supported in IE7 - IE9. -

        -
        -
        -
        diff --git a/library/font_awesome/src/_includes/examples/animated.html b/library/font_awesome/src/_includes/examples/animated.html new file mode 100644 index 000000000..960ebd182 --- /dev/null +++ b/library/font_awesome/src/_includes/examples/animated.html @@ -0,0 +1,60 @@ +
        + +
        +
        +

        + + Loading example (with fa-spinner icon) + + + Loading (with fa-circle-o-notch icon) + + + Loading example (with fa-refresh icon) + + + Loading example (with fa-cog icon) + + + Loading example (with fa-spinner icon) +

        +
        +
        +

        + Use the fa-spin class to get any icon to rotate, and use fa-pulse to have it rotate + with 8 steps. Works well with fa-spinner, fa-refresh, and fa-cog. +

        +{% highlight html %} + +Loading... + + +Loading... + + +Loading... + + +Loading... + + +Loading... +{% endhighlight %} +

        + Note: + Some browsers on some platforms have issues with animated icons resulting in a jittery wobbling effect. See + issue #671 + for examples and possible workarounds. +

        +

        + Note: CSS3 animations aren't supported in IE8 - IE9. +

        +
        +
        +
        diff --git a/library/font_awesome/src/_includes/examples/basic.html b/library/font_awesome/src/_includes/examples/basic.html new file mode 100644 index 000000000..2b691a0b5 --- /dev/null +++ b/library/font_awesome/src/_includes/examples/basic.html @@ -0,0 +1,39 @@ +
        + + +
        +
        +

        + + Example: basic icon + fa-camera-retro +

        +
        +
        +

        + You can place Font Awesome icons just about anywhere using the CSS Prefix fa and the icon's + name. Font Awesome is designed to be used with inline elements (we like the <i> tag for + brevity, but using a <span> is more semantically correct). +

        +{% highlight html %} + fa-camera-retro +{% endhighlight %} +
        +
          +
        • + + Example: basic icon + If you change the font-size of the icon's container, the icon gets bigger. Same things goes for color, + drop shadow, and anything else that gets inherited using CSS. +
        • +
        +
        +
        +
        +
        diff --git a/library/font_awesome/src/_includes/examples/bootstrap.html b/library/font_awesome/src/_includes/examples/bootstrap.html new file mode 100644 index 000000000..0d6c03b8f --- /dev/null +++ b/library/font_awesome/src/_includes/examples/bootstrap.html @@ -0,0 +1,111 @@ +
        + +
        + +
        +

        + Font Awesome works great with the full range of Bootstrap components. +

        +{% highlight html %} + + Delete + + Settings + + + Font Awesome
        Version {{ site.fontawesome.version }}
        + + + +
        + + +
        +
        + + +
        + + +{% endhighlight %} +
        +
        +
        diff --git a/library/font_awesome/src/_includes/examples/bordered-pulled.html b/library/font_awesome/src/_includes/examples/bordered-pulled.html index b5aa2bf17..33f9922ed 100644 --- a/library/font_awesome/src/_includes/examples/bordered-pulled.html +++ b/library/font_awesome/src/_includes/examples/bordered-pulled.html @@ -1,32 +1,29 @@
        - +
        -
        +

        - Use icon-border and pull-right or pull-left for easy pull quotes or - article graphics. + + …tomorrow we will run faster, stretch out our arms farther… And then one fine morning— + So we beat on, boats against the current, borne back ceaselessly into the past.

        -
        -
        - - Use a few of the new styles together, and you've got easy pull quotes or a great introductory article image. - Or spinning icons for loading and refreshing content. Or fun big icons in multi-line buttons. You can combine all - of them in any combination to get lots of new possibilities. -
        -{% highlight html %} - -Use a few of the new styles together ... lots of new possibilities. -{% endhighlight %} -
        - - Use a few of the new styles together, and you've got easy pull quotes or a great introductory article image. - Or spinning icons for loading and refreshing content. Or fun big icons in multi-line buttons. You can combine all - of them in any combination to get lots of new possibilities. -
        +
        +

        + Use fa-border and fa-pull-right or fa-pull-left for easy pull quotes or + article icons. +

        {% highlight html %} - -Use a few of the new styles together ... lots of new possibilities. + +...tomorrow we will run faster, stretch out our arms farther... +And then one fine morning— So we beat on, boats against the +current, borne back ceaselessly into the past. {% endhighlight %}
        diff --git a/library/font_awesome/src/_includes/examples/bulleted-lists.html b/library/font_awesome/src/_includes/examples/bulleted-lists.html deleted file mode 100644 index 73db34e47..000000000 --- a/library/font_awesome/src/_includes/examples/bulleted-lists.html +++ /dev/null @@ -1,31 +0,0 @@ -
        - -
        -
        -
        -
        -
          -
        • Bulleted lists (like this one)
        • -
        • Buttons
        • -
        • Button groups
        • -
        • Navigation
        • -
        • Prepended form inputs
        • -
        • …and many more with custom CSS
        • -
        -
        -
        -

        Easily replace individual bullets.

        -{% highlight html %} -
          -
        • Bulleted lists (like this one)
        • -
        • Buttons
        • -
        • Button groups
        • -
        • Navigation
        • -
        • Prepended form inputs
        • -
        • …and many more with custom CSS
        • -
        -{% endhighlight %} -
        Make sure to NOT include any whitespace after the icon declaration.
        -
        -
        -
        diff --git a/library/font_awesome/src/_includes/examples/button-dropdowns.html b/library/font_awesome/src/_includes/examples/button-dropdowns.html deleted file mode 100644 index 201eb1cd4..000000000 --- a/library/font_awesome/src/_includes/examples/button-dropdowns.html +++ /dev/null @@ -1,36 +0,0 @@ -
        - -
        -
        - -
        -
        -{% highlight html %} - -{% endhighlight %} -
        Don't forget to add the appropriate JavaScript to enable button dropdowns.
        -
        -
        -
        diff --git a/library/font_awesome/src/_includes/examples/button-groups.html b/library/font_awesome/src/_includes/examples/button-groups.html deleted file mode 100644 index ce4892309..000000000 --- a/library/font_awesome/src/_includes/examples/button-groups.html +++ /dev/null @@ -1,25 +0,0 @@ -
        - -
        -
        -

        -

        - - - - -
        -

        -
        -
        -{% highlight html %} -
        - - - - -
        -{% endhighlight %} -
        -
        -
        diff --git a/library/font_awesome/src/_includes/examples/buttons.html b/library/font_awesome/src/_includes/examples/buttons.html deleted file mode 100644 index b8d147c07..000000000 --- a/library/font_awesome/src/_includes/examples/buttons.html +++ /dev/null @@ -1,57 +0,0 @@ -
        - -
        - -
        -

        - Font Awesome icons work great in buttons. You can even combine them with larger icon styles, - pull-right and pull-left, and icon-spin. -

        -{% highlight html %} - - Reload - - Checkout - - Comment - - Info - - Delete - - Settings - - Font Awesome
        Version {{ site.fontawesome.version }}
        - - Synchronizing Content... -{% endhighlight %} -
        -
        -
        diff --git a/library/font_awesome/src/_includes/examples/custom.html b/library/font_awesome/src/_includes/examples/custom.html index dfad1900c..2de7ad7ab 100644 --- a/library/font_awesome/src/_includes/examples/custom.html +++ b/library/font_awesome/src/_includes/examples/custom.html @@ -1,10 +1,10 @@
        -
        +

        Anything you can do with CSS font styles, you can do with Font Awesome.

        -
        +

        Star Ratings (inspired by CSS Tricks)

        diff --git a/library/font_awesome/src/_includes/examples/fixed-width.html b/library/font_awesome/src/_includes/examples/fixed-width.html new file mode 100644 index 000000000..845a79609 --- /dev/null +++ b/library/font_awesome/src/_includes/examples/fixed-width.html @@ -0,0 +1,33 @@ +
        + +
        + +
        +

        + Use fa-fw to set icons at a fixed width. Great to use when different icon widths throw off alignment. + Especially useful in things like nav lists & list groups. +

        +{% highlight html %} + +{% endhighlight %} +
        +
        +
        diff --git a/library/font_awesome/src/_includes/examples/form-inputs.html b/library/font_awesome/src/_includes/examples/form-inputs.html deleted file mode 100644 index dcb39a8f2..000000000 --- a/library/font_awesome/src/_includes/examples/form-inputs.html +++ /dev/null @@ -1,31 +0,0 @@ -
        - -
        -
        -
        -
        - - -
        -
        - - -
        -
        -
        -
        -{% highlight html %} -
        -
        - - -
        -
        - - -
        -
        -{% endhighlight %} -
        -
        -
        diff --git a/library/font_awesome/src/_includes/examples/inline-icons.html b/library/font_awesome/src/_includes/examples/inline-icons.html deleted file mode 100644 index 3965e7c2a..000000000 --- a/library/font_awesome/src/_includes/examples/inline-icons.html +++ /dev/null @@ -1,19 +0,0 @@ -
        - -
        -
        -

        Place Font Awesome icons just about anywhere with the <i> tag.

        -
        -
        -
        -
        - icon-camera-retro -
        -
        -{% highlight html %} - icon-camera-retro -{% endhighlight %} -
        Icon classes are echoed via CSS :before.
        -
        -
        -
        diff --git a/library/font_awesome/src/_includes/examples/larger-icons.html b/library/font_awesome/src/_includes/examples/larger-icons.html deleted file mode 100644 index 95f1ee13b..000000000 --- a/library/font_awesome/src/_includes/examples/larger-icons.html +++ /dev/null @@ -1,35 +0,0 @@ -
        - -
        -
        -

        - To increase the size of icons relative to its container, use icon-large, icon-2x, - icon-3x, or icon-4x. -

        -
        -
        -

        - Increase the icon size by using the icon-large (33% increase), icon-2x, - icon-3x, or icon-4x classes. -

        -
        -
        -

        icon-camera-retro

        -

        icon-camera-retro

        -

        icon-camera-retro

        -

        icon-camera-retro

        -
        -
        -{% highlight html %} -

        icon-camera-retro

        -

        icon-camera-retro

        -

        icon-camera-retro

        -

        icon-camera-retro

        -{% endhighlight %} -
        - If your icons are getting chopped off on top and bottom, make sure you have - sufficient line-height. -
        -
        -
        -
        diff --git a/library/font_awesome/src/_includes/examples/larger.html b/library/font_awesome/src/_includes/examples/larger.html new file mode 100644 index 000000000..f10c7188a --- /dev/null +++ b/library/font_awesome/src/_includes/examples/larger.html @@ -0,0 +1,40 @@ +
        + +
        +
        +

        fa-lg

        +

        fa-2x

        +

        fa-3x

        +

        fa-4x

        +

        fa-5x

        +
        +
        +

        + To increase icon sizes relative to their container, use the fa-lg (33% increase), fa-2x, + fa-3x, fa-4x, or fa-5x classes. +

        +{% highlight html %} + fa-lg + fa-2x + fa-3x + fa-4x + fa-5x +{% endhighlight %} +
        +
          +
        • + + If your icons are getting chopped off on top and bottom, make sure you have + sufficient line-height. +
        • +
        +
        +
        +
        +
        diff --git a/library/font_awesome/src/_includes/examples/list.html b/library/font_awesome/src/_includes/examples/list.html new file mode 100644 index 000000000..a708902be --- /dev/null +++ b/library/font_awesome/src/_includes/examples/list.html @@ -0,0 +1,30 @@ +
        + +
        +
        +
          +
        • List icons
        • +
        • can be used
        • +
        • as bullets
        • +
        • in lists
        • +
        +
        +
        +

        Use fa-ul and fa-li to easily replace default bullets in unordered lists.

        +{% highlight html %} +
          +
        • List icons
        • +
        • can be used
        • +
        • as bullets
        • +
        • in lists
        • +
        +{% endhighlight %} +
        +
        +
        diff --git a/library/font_awesome/src/_includes/examples/navigation.html b/library/font_awesome/src/_includes/examples/navigation.html deleted file mode 100644 index 850e64442..000000000 --- a/library/font_awesome/src/_includes/examples/navigation.html +++ /dev/null @@ -1,26 +0,0 @@ - diff --git a/library/font_awesome/src/_includes/examples/new.html b/library/font_awesome/src/_includes/examples/new.html deleted file mode 100644 index 8393f7d36..000000000 --- a/library/font_awesome/src/_includes/examples/new.html +++ /dev/null @@ -1,47 +0,0 @@ -<{% if page.navbar_active == "examples" %}div{% else %}section{% endif %} id="new-styles"> - -
        -
        -

        Rotated and Flipped Icons

        -
        -   normal
        -   icon-rotate-90
        -   icon-rotate-180
        -   icon-rotate-270
        -   icon-flip-horizontal
        -   icon-flip-vertical -
        -
        -
        -

        Stacked Icons

        -
        - - - - - icon-twitter on icon-check-empty
        - - - - - icon-flag on icon-circle
        - - - - - icon-terminal on icon-sign-blank -
        -
        -
        -

        Better Bulleted Lists

        -
        -
          -
        • New bulleted lists
        • -
        • Fix some old bugs
        • -
        • And deal with arbitrary
        • -
        • Font sizes better
        • -
        -
        -
        -
        - diff --git a/library/font_awesome/src/_includes/examples/rotated-flipped.html b/library/font_awesome/src/_includes/examples/rotated-flipped.html index cf061cd59..4c5b437f1 100644 --- a/library/font_awesome/src/_includes/examples/rotated-flipped.html +++ b/library/font_awesome/src/_includes/examples/rotated-flipped.html @@ -1,29 +1,34 @@
        - +
        -
        - A set of classes that can be used to arbitrarily rotate and flip icons. +
        +

        +   normal
        +   fa-rotate-90
        +   fa-rotate-180
        +   fa-rotate-270
        +   fa-flip-horizontal
        +   fa-flip-vertical +

        -
        -
        -   normal
        -   icon-rotate-90
        -   icon-rotate-180
        -   icon-rotate-270
        -   icon-flip-horizontal
        -   icon-flip-vertical -
        +
        +

        + To arbitrarily rotate and flip icons, use the fa-rotate-* and fa-flip-* classes. +

        {% highlight html %} -  normal
        -  icon-rotate-90
        -  icon-rotate-180
        -  icon-rotate-270
        -  icon-flip-horizontal
        -  icon-flip-vertical + normal
        + fa-rotate-90
        + fa-rotate-180
        + fa-rotate-270
        + fa-flip-horizontal
        + fa-flip-vertical {% endhighlight %} -

        - Rotating and flipping icons aren't yet supported in IE7. -

        diff --git a/library/font_awesome/src/_includes/examples/stacked.html b/library/font_awesome/src/_includes/examples/stacked.html index 3e7240c12..505ed2edf 100644 --- a/library/font_awesome/src/_includes/examples/stacked.html +++ b/library/font_awesome/src/_includes/examples/stacked.html @@ -1,54 +1,64 @@
        - -
        -
        - A method for easily stacking multiple icons. Use the icon-stack class on the parent and - icon-stack-base for the bottom icon. + +
        +
        +
        + - icon-twitter on icon-check-empty
        - - - + fa-twitter on fa-square-o
        + - icon-flag on icon-circle
        - - - + fa-flag on fa-circle
        + - icon-terminal on icon-sign-blank
        - - - + fa-terminal on fa-square
        + - icon-camera on icon-ban-circle + fa-ban on fa-camera
        +
        +
        +

        + To stack multiple icons, use the fa-stack class on the parent, the fa-stack-1x + for the regularly sized icon, and fa-stack-2x for the larger icon. fa-inverse + can be used as an alternative icon color. You can even throw larger icon classes on the parent + to get further control of sizing. +

        {% highlight html %} - - - + + + -icon-twitter on icon-check-empty
        - - - +fa-twitter on fa-square-o
        + + + -icon-flag on icon-circle
        - - - +fa-flag on fa-circle
        + + + -icon-terminal on icon-sign-blank
        - - - +fa-terminal on fa-square
        + + + -icon-camera on icon-ban-circle +fa-ban on fa-camera {% endhighlight %}
        diff --git a/library/font_awesome/src/_includes/footer.html b/library/font_awesome/src/_includes/footer.html index 186b1524d..e299adf2e 100644 --- a/library/font_awesome/src/_includes/footer.html +++ b/library/font_awesome/src/_includes/footer.html @@ -1,23 +1,41 @@ -