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

util/generate-hooks-index/.gitignore

@@ -0,0 +1,11 @@
+/target
+/classes
+/checkouts
+pom.xml
+pom.xml.asc
+*.jar
+*.class
+/.lein-*
+/.nrepl-port
+.hgignore
+.hg/

util/generate-hooks-index/CHANGELOG.md

@@ -0,0 +1,24 @@
+# Change Log
+All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/).
+
+## [Unreleased][unreleased]
+### Changed
+- Add a new arity to `make-widget-async` to provide a different widget shape.
+
+## [0.1.1] - 2015-11-03
+### Changed
+- Documentation on how to make the widgets.
+
+### Removed
+- `make-widget-sync` - we're all async, all the time.
+
+### Fixed
+- Fixed widget maker to keep working when daylight savings switches over.
+
+## 0.1.0 - 2015-11-03
+### Added
+- Files from the new template.
+- Widget maker public API - `make-widget-sync`.
+
+[unreleased]: https://github.com/your-name/generate-hooks-index/compare/0.1.1...HEAD
+[0.1.1]: https://github.com/your-name/generate-hooks-index/compare/0.1.0...0.1.1

util/generate-hooks-index/LICENSE

@@ -0,0 +1,214 @@
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and
+documentation distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates' from
+a Contributor if it was added to the Program by such Contributor itself or
+anyone acting on such Contributor's behalf. Contributions do not include
+additions to the Program which: (i) are separate modules of software
+distributed in conjunction with the Program under their own license
+agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free copyright license to
+reproduce, prepare derivative works of, publicly display, publicly perform,
+distribute and sublicense the Contribution of such Contributor, if any, and
+such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free patent license under
+Licensed Patents to make, use, sell, offer to sell, import and otherwise
+transfer the Contribution of such Contributor, if any, in source code and
+object code form.  This patent license shall apply to the combination of the
+Contribution and the Program if, at the time the Contribution is added by the
+Contributor, such addition of the Contribution causes such combination to be
+covered by the Licensed Patents. The patent license shall not apply to any
+other combinations which include the Contribution. No hardware per se is
+licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses
+to its Contributions set forth herein, no assurances are provided by any
+Contributor that the Program does not infringe the patent or other
+intellectual property rights of any other entity. Each Contributor disclaims
+any liability to Recipient for claims brought by any other entity based on
+infringement of intellectual property rights or otherwise. As a condition to
+exercising the rights and licenses granted hereunder, each Recipient hereby
+assumes sole responsibility to secure any other intellectual property rights
+needed, if any. For example, if a third party patent license is required to
+allow Recipient to distribute the Program, it is Recipient's responsibility
+to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient
+copyright rights in its Contribution, if any, to grant the copyright license
+set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under
+its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for
+damages, including direct, indirect, special, incidental and consequential
+damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered
+by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such
+Contributor, and informs licensees how to obtain it in a reasonable manner on
+or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within
+the Program.
+
+Each Contributor must identify itself as the originator of its Contribution,
+if any, in a manner that reasonably allows subsequent Recipients to identify
+the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a
+manner which does not create potential liability for other Contributors.
+Therefore, if a Contributor includes the Program in a commercial product
+offering, such Contributor ("Commercial Contributor") hereby agrees to defend
+and indemnify every other Contributor ("Indemnified Contributor") against any
+losses, damages and costs (collectively "Losses") arising from claims,
+lawsuits and other legal actions brought by a third party against the
+Indemnified Contributor to the extent caused by the acts or omissions of such
+Commercial Contributor in connection with its distribution of the Program in
+a commercial product offering.  The obligations in this section do not apply
+to any claims or Losses relating to any actual or alleged intellectual
+property infringement. In order to qualify, an Indemnified Contributor must:
+a) promptly notify the Commercial Contributor in writing of such claim, and
+b) allow the Commercial Contributor tocontrol, and cooperate with the
+Commercial Contributor in, the defense and any related settlement
+negotiations. The Indemnified Contributor may participate in any such claim
+at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If
+that Commercial Contributor then makes performance claims, or offers
+warranties related to Product X, those performance claims and warranties are
+such Commercial Contributor's responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON
+AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER
+EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR
+CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A
+PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the
+appropriateness of using and distributing the Program and assumes all risks
+associated with its exercise of rights under this Agreement , including but
+not limited to the risks and costs of program errors, compliance with
+applicable laws, damage to or loss of data, programs or equipment, and
+unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
+LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of the
+remainder of the terms of this Agreement, and without further action by the
+parties hereto, such provision shall be reformed to the minimum extent
+necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+(excluding combinations of the Program with other software or hardware)
+infringes such Recipient's patent(s), then such Recipient's rights granted
+under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and
+does not cure such failure in a reasonable period of time after becoming
+aware of such noncompliance. If all Recipient's rights under this Agreement
+terminate, Recipient agrees to cease use and distribution of the Program as
+soon as reasonably practicable. However, Recipient's obligations under this
+Agreement and any licenses granted by Recipient relating to the Program shall
+continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to
+time. No one other than the Agreement Steward has the right to modify this
+Agreement. The Eclipse Foundation is the initial Agreement Steward. The
+Eclipse Foundation may assign the responsibility to serve as the Agreement
+Steward to a suitable separate entity. Each new version of the Agreement will
+be given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly
+stated in Sections 2(a) and 2(b) above, Recipient receives no rights or
+licenses to the intellectual property of any Contributor under this
+Agreement, whether expressly, by implication, estoppel or otherwise. All
+rights in the Program not expressly granted under this Agreement are
+reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial
+in any resulting litigation.

util/generate-hooks-index/README.md

@@ -0,0 +1,30 @@
+# Generate hooks
+
+This program generates hooks.html documentation from the Hubzilla source.
+
+## Usage
+
+Download and install leiningen
+
+Change directory into  hubzilla/util/generate-hooks-index
+
+At shell prompt, do:
+
+```sh
+lein run
+```
+
+Hooks docs will get dumped into hubzilla/doc/hooks.html
+
+## Requirements
+
+* JVM like OpenJDK etc
+
+* [Leiningen](http://leiningen.org/)
+
+## License
+
+Copyright © 2015 ken restivo (ken@restivo.org)
+
+Distributed under the Eclipse Public License either version 1.0 or (at
+your option) any later version.

util/generate-hooks-index/doc/intro.md

@@ -0,0 +1,3 @@
+# Introduction to generate-hooks-index
+
+TODO: write [great documentation](http://jacobian.org/writing/what-to-write/)

util/generate-hooks-index/project.clj

@@ -0,0 +1,10 @@
+(defproject generate-hooks-index "0.1.0-SNAPSHOT"
+  :description "Generates Hooks docs for Hubzilla"
+  :url "https://github.com/redmatrix/hubzilla"
+  :license {:name "Eclipse Public License"
+            :url "http://www.eclipse.org/legal/epl-v10.html"}
+  :dependencies [[org.clojure/clojure "1.7.0"]
+                 [com.taoensso/timbre "4.1.2"]
+                 [hiccup "1.0.0"]]
+  :main generate-hooks-index.core)
+

util/generate-hooks-index/src/generate_hooks_index/core.clj

@@ -0,0 +1,82 @@
+(ns generate-hooks-index.core
+  (:require [clojure.string :as str]
+            [hiccup.core :as h]
+            [taoensso.timbre :as log]
+            [clojure.java.shell :as sh])
+  (:gen-class))
+
+(log/set-level! :info)
+
+(defn clean-fn-arg
+  [s]
+  (-> s
+      (str/replace #"'" "")
+      (str/replace #"\"" "")
+      str/trim))
+
+(defn check-fn-args
+  [xs]
+  (when (-> xs first empty?)
+    (throw (Exception. "empty function")))
+  (map clean-fn-arg xs))
+
+
+(defn get-fn-arg
+  [s]
+  (->> s
+       (re-matches #".*call_hooks\((.+)\,(.*)\).*")
+       rest
+       check-fn-args))
+
+
+
+(defn fix-path
+  [path file]
+  (str/replace file path ""))
+
+
+(defn show-hooks
+  [path]
+  (for [s (-> (sh/sh "rgrep" "call_hooks" path)
+              :out
+              str/split-lines)
+        :let [[file hook]   (str/split s #"\t*:")]]
+    (try
+      (-> (zipmap [:function :arg] (get-fn-arg hook))
+          (assoc  :file (fix-path path file)))
+      (catch Exception e
+        (log/debug e s file hook)))))
+
+
+
+(defn hiccupy
+  [path]
+  [:div
+   [:h3 "Hooks"]
+   [:table
+    [:tr (map #(vector :td %) ["Function" "Source File" "Arg"])]
+    (for [{:keys [function arg file]} 
+          (->> path
+               show-hooks
+               (sort-by :function))]
+      [:tr  (map #(vector :td (h/h %)) [function file arg])])]
+   [:p "Generated " (-> (java.util.Date.) str)]])
+
+
+(defn make-hook-docs
+  [path-to-hubzillla]
+  (->> path-to-hubzillla
+       hiccupy
+       h/html
+       (spit (str path-to-hubzillla "doc/hooks.html"))))
+
+
+(defn -main
+  [& args]
+  (log/info "Starting..")
+  (make-hook-docs (str (System/getProperty "user.dir") "/../../"))
+  (log/info "Done!")
+  (System/exit 0))
+
+
+

util/generate-hooks-index/test/generate_hooks_index/core_test.clj

@@ -0,0 +1,7 @@
+(ns generate-hooks-index.core-test
+  (:require [clojure.test :refer :all]
+            [generate-hooks-index.core :refer :all]))
+
+(deftest a-test
+  (testing "FIXME, I fail."
+    (is (= 0 1))))

view/css/mod_chat.css

@@ -6,18 +6,19 @@
  #chatTopBar {
 	 float: left;
 	 height: 400px;
-	 width: 400px;
+	 width: 77%;
 	 overflow-y: auto;
  }
  
  #chatSide {
 	 float: right;
-	 width: 150px;
+	 width: 20%;
 	 height: 100%;
  }
 
  #chatDrop {
-	margin-bottom: 20px;
+	margin: 20px 0;
+	float: right;
 }
 
  #chatUsers {
@@ -31,6 +32,14 @@
 	 margin-top: 20px;
  }
  
+#chatOptionsBar {
+	margin-top: 20px;
+}
+
+ #chatText {
+	 width: 100%;
+ }
+
  section {
 	 padding-bottom: 0;
  }
@@ -60,3 +69,5 @@
 	padding: 3px;
 	display: inline-block;
 }
+
+

view/css/widgets.css

@@ -27,6 +27,7 @@
 
 #side-follow-url {
 	margin-top: 5px;
+	width: 100%;
 }
 
 #side-follow-submit {

view/it/hstrings.php

@@ -5,12 +5,6 @@ function string_plural_select_it($n){
 	return ($n != 1);;
 }}
 ;
-$a->strings["Attachments:"] = "Allegati:";
-$a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
-$a->strings["\$Projectname event notification:"] = "Notifica evento \$Projectname:";
-$a->strings["Starts:"] = "Inizio:";
-$a->strings["Finishes:"] = "Fine:";
-$a->strings["Location:"] = "Luogo:";
 $a->strings["No username found in import file."] = "Impossibile trovare il nome utente nel file da importare.";
 $a->strings["Unable to create a unique channel address. Import failed."] = "Impossibile creare un indirizzo univoco per il canale. L'import è fallito.";
 $a->strings["Import completed."] = "L'importazione è terminata con successo.";
@@ -127,8 +121,10 @@ $a->strings["Channel Sources"] = "Sorgenti del canale";
 $a->strings["Automatically import channel content from other channels or feeds"] = "Importa automaticamente il contenuto del canale da altri canali o feed";
 $a->strings["Even More Encryption"] = "Cifratura addizionale";
 $a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Rendi possibile la crifratura aggiuntiva tra mittente e destinatario usando una parola chiave conosciuta a entrambi";
-$a->strings["Enable voting tools"] = "Permetti i post con votazione";
+$a->strings["Enable Voting Tools"] = "Abilita gli strumenti per votare";
 $a->strings["Provide a class of post which others can vote on"] = "Rende possibile la creazione di post in cui sarà possibile votare";
+$a->strings["Delayed Posting"] = "Pubblicazione ritardata";
+$a->strings["Allow posts to be published at a later date"] = "Per scegliere una data e un'ora a cui far uscire i post";
 $a->strings["Network and Stream Filtering"] = "Filtraggio dei contenuti";
 $a->strings["Search by Date"] = "Ricerca per data";
 $a->strings["Ability to select posts by date ranges"] = "Per selezionare i post in un intervallo tra date";
@@ -375,6 +371,10 @@ $a->strings["Don't care"] = "Chi se ne frega";
 $a->strings["Ask me"] = "Chiedimelo";
 $a->strings["Embedded content"] = "Contenuti incorporati";
 $a->strings["Embedding disabled"] = "Disabilita la creazione di contenuti incorporati";
+$a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
+$a->strings["Starts:"] = "Inizio:";
+$a->strings["Finishes:"] = "Fine:";
+$a->strings["Location:"] = "Luogo:";
 $a->strings["This event has been added to your calendar."] = "Questo evento è stato aggiunto al tuo calendario";
 $a->strings["event"] = "l'evento";
 $a->strings["Not specified"] = "Non specificato";
@@ -412,6 +412,21 @@ $a->strings["Profile Photo"] = "Foto del profilo";
 $a->strings["Update"] = "Aggiorna";
 $a->strings["Install"] = "Installa";
 $a->strings["Purchase"] = "Acquista";
+$a->strings["Item was not found."] = "Elemento non trovato.";
+$a->strings["No source file."] = "Nessun file di origine.";
+$a->strings["Cannot locate file to replace"] = "Il file da sostituire non è stato trovato";
+$a->strings["Cannot locate file to revise/update"] = "Il file da aggiornare non è stato trovato";
+$a->strings["File exceeds size limit of %d"] = "Il file supera la dimensione massima di %d";
+$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Hai raggiunto il limite complessivo di %1$.0f Mbytes per gli allegati.";
+$a->strings["File upload failed. Possible system limit or action terminated."] = "Caricamento file fallito, potrebbe essere stato interrotto o potrebbe aver superato lo spazio assegnato.";
+$a->strings["Stored file could not be verified. Upload failed."] = "Il file non può essere verificato. Caricamento fallito.";
+$a->strings["Path not available."] = "Percorso non disponibile.";
+$a->strings["Empty pathname"] = "Il percorso del file è vuoto";
+$a->strings["duplicate filename or path"] = "il file o il percorso del file è duplicato";
+$a->strings["Path not found."] = "Percorso del file non trovato.";
+$a->strings["mkdir failed."] = "mkdir fallito.";
+$a->strings["database storage failed."] = "scrittura su database fallita.";
+$a->strings["Empty path"] = "La posizione è vuota";
 $a->strings["Logged out."] = "Uscita effettuata.";
 $a->strings["Failed authentication"] = "Autenticazione fallita";
 $a->strings["Login failed."] = "Accesso fallito.";
@@ -713,6 +728,8 @@ $a->strings["Love/Romance:"] = "Amore:";
 $a->strings["Work/employment:"] = "Lavoro:";
 $a->strings["School/education:"] = "Scuola:";
 $a->strings["Like this thing"] = "Mi piace";
+$a->strings["Attachments:"] = "Allegati:";
+$a->strings["\$Projectname event notification:"] = "Notifica evento \$Projectname:";
 $a->strings["Tags"] = "Tag";
 $a->strings["Keywords"] = "Parole chiave";
 $a->strings["have"] = "ho";
@@ -721,21 +738,6 @@ $a->strings["want"] = "voglio";
 $a->strings["wants"] = "vuole";
 $a->strings["likes"] = "gli piace";
 $a->strings["dislikes"] = "non gli piace";
-$a->strings["Item was not found."] = "Elemento non trovato.";
-$a->strings["No source file."] = "Nessun file di origine.";
-$a->strings["Cannot locate file to replace"] = "Il file da sostituire non è stato trovato";
-$a->strings["Cannot locate file to revise/update"] = "Il file da aggiornare non è stato trovato";
-$a->strings["File exceeds size limit of %d"] = "Il file supera la dimensione massima di %d";
-$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Hai raggiunto il limite complessivo di %1$.0f Mbytes per gli allegati.";
-$a->strings["File upload failed. Possible system limit or action terminated."] = "Caricamento file fallito, potrebbe essere stato interrotto o potrebbe aver superato lo spazio assegnato.";
-$a->strings["Stored file could not be verified. Upload failed."] = "Il file non può essere verificato. Caricamento fallito.";
-$a->strings["Path not available."] = "Percorso non disponibile.";
-$a->strings["Empty pathname"] = "Il percorso del file è vuoto";
-$a->strings["duplicate filename or path"] = "il file o il percorso del file è duplicato";
-$a->strings["Path not found."] = "Percorso del file non trovato.";
-$a->strings["mkdir failed."] = "mkdir fallito.";
-$a->strings["database storage failed."] = "scrittura su database fallita.";
-$a->strings["Empty path"] = "La posizione è vuota";
 $a->strings["channel"] = "il canale";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s piace %3\$s di %2\$s";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s non piace %3\$s di %2\$s";
@@ -808,13 +810,14 @@ $a->strings["set location"] = "la tua località";
 $a->strings["Toggle voting"] = "Abilita/disabilita il voto";
 $a->strings["Clear browser location"] = "Rimuovi la località data dal browser";
 $a->strings["clear location"] = "rimuovi la località";
-$a->strings["Title (optional)"] = "Titolo (opzionale)";
+$a->strings["Title (optional)"] = "Titolo (facoltativo)";
-$a->strings["Categories (optional, comma-separated list)"] = "Categorie (lista separata da virgole)";
+$a->strings["Categories (optional, comma-separated list)"] = "Categorie (facoltative, lista separata da virgole)";
 $a->strings["Permission settings"] = "Permessi dei tuoi contatti";
 $a->strings["permissions"] = "permessi";
 $a->strings["Public post"] = "Post pubblico";
 $a->strings["Example: bob@example.com, mary@example.com"] = "Per esempio: mario@esempio.com, simona@esempio.com";
 $a->strings["Set expiration date"] = "Data di scadenza";
+$a->strings["Set publish date"] = "Data di uscita programmata";
 $a->strings["OK"] = "OK";
 $a->strings["Cancel"] = "Annulla";
 $a->strings["Discover"] = "Scopri";
@@ -1146,15 +1149,17 @@ $a->strings["Accept connection to allow communication"] = "Entra in contatto per
 $a->strings["Set Affinity"] = "Scegli l'affinità";
 $a->strings["Set Profile"] = "Scegli il profilo da mostrare";
 $a->strings["Set Affinity & Profile"] = "Affinità e profilo";
+$a->strings["none"] = "--";
 $a->strings["Apply these permissions automatically"] = "Applica automaticamente questi permessi";
-$a->strings["This connection's address is"] = "Indirizzo di questo contatto";
+$a->strings["This connection's primary address is"] = "Indirizzo primario di questo canale";
+$a->strings["Available locations:"] = "Indirizzi disponibili";
 $a->strings["The permissions indicated on this page will be applied to all new connections."] = "I permessi indicati su questa pagina saranno applicati a tutti i nuovi contatti da ora in poi.";
 $a->strings["Slide to adjust your degree of friendship"] = "Trascina per restringere il grado di amicizia da mostrare";
 $a->strings["Slide to adjust your rating"] = "Trascina per cambiare la tua valutazione";
-$a->strings["Optionally explain your rating"] = "Commento opzionale";
+$a->strings["Optionally explain your rating"] = "Commento facoltativo";
 $a->strings["Custom Filter"] = "Filtro personalizzato";
 $a->strings["Only import posts with this text"] = "Importa solo i post che contengono queste parole chiave";
-$a->strings["words one per line or #tags or /patterns/, leave blank to import all posts"] = "una parola per riga, oppure #tag o /pattern/ oppure lascia vuoto per importare tutto";
+$a->strings["words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"] = "per ogni riga: parole, #tag, /pattern/ o lang=xx , lascia vuoto per importare tutto";
 $a->strings["Do not import posts with this text"] = "Non importare i post con queste parole chiave";
 $a->strings["This information is public!"] = "Questa informazione è pubblica!";
 $a->strings["Connection Pending Approval"] = "Contatti in attesa di approvazione";
@@ -1175,45 +1180,6 @@ $a->strings["Hub not found."] = "Hub non trovato.";
 $a->strings["This setting requires special processing and editing has been blocked."] = "Questa impostazione è bloccata, richiede criteri di modifica speciali";
 $a->strings["Configuration Editor"] = "Editor di configurazione";
 $a->strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Attenzione: alcune delle impostazioni, se cambiate, potrebbero rendere questo canale non funzionante. Lascia questa pagina a meno che tu non sappia con assoluta certezza quali modifiche effettuare.";
-$a->strings["Page owner information could not be retrieved."] = "Impossibile ottenere informazioni sul proprietario della pagina.";
-$a->strings["Album not found."] = "Album non trovato.";
-$a->strings["Delete Album"] = "Elimina album";
-$a->strings["Delete Photo"] = "Elimina foto";
-$a->strings["No photos selected"] = "Nessuna foto selezionata";
-$a->strings["Access to this item is restricted."] = "Questo elemento non è visibile a tutti.";
-$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "Hai usato %1$.2f Mb dei %2$.2f Mb di spazio disponibile.";
-$a->strings["%1$.2f MB photo storage used."] = "Hai usato %1$.2f Mb del tuo spazio disponibile.";
-$a->strings["Upload Photos"] = "Carica foto";
-$a->strings["Enter an album name"] = "Scegli il nome dell'album";
-$a->strings["or select an existing album (doubleclick)"] = "o seleziona un album esistente (doppio click)";
-$a->strings["Create a status post for this upload"] = "Pubblica sulla bacheca";
-$a->strings["Album name could not be decoded"] = "Non è stato possibile leggere il nome dell'album";
-$a->strings["Contact Photos"] = "Foto dei contatti";
-$a->strings["Show Newest First"] = "Prima i più recenti";
-$a->strings["Show Oldest First"] = "Prima i più vecchi";
-$a->strings["View Photo"] = "Guarda la foto";
-$a->strings["Edit Album"] = "Modifica album";
-$a->strings["Permission denied. Access to this item may be restricted."] = "Permesso negato. L'accesso a questo elemento può essere stato limitato.";
-$a->strings["Photo not available"] = "Foto non disponibile";
-$a->strings["Use as profile photo"] = "Usa come foto del profilo";
-$a->strings["Private Photo"] = "Foto privata";
-$a->strings["Previous"] = "Precendente";
-$a->strings["View Full Size"] = "Vedi nelle dimensioni originali";
-$a->strings["Next"] = "Successivo";
-$a->strings["Remove"] = "Rimuovi";
-$a->strings["Edit photo"] = "Modifica la foto";
-$a->strings["Rotate CW (right)"] = "Ruota (senso orario)";
-$a->strings["Rotate CCW (left)"] = "Ruota (senso antiorario)";
-$a->strings["Enter a new album name"] = "Inserisci il nome del nuovo album";
-$a->strings["or select an existing one (doubleclick)"] = "o seleziona uno esistente (doppio click)";
-$a->strings["Caption"] = "Didascalia";
-$a->strings["Add a Tag"] = "Aggiungi tag";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Esempio: @bob, @Barbara_Jensen, @jim@example.com";
-$a->strings["Flag as adult in album view"] = "Marca come 'per adulti'";
-$a->strings["In This Photo:"] = "In questa foto:";
-$a->strings["Map"] = "Mappa";
-$a->strings["View Album"] = "Guarda l'album";
-$a->strings["Recent Photos"] = "Foto recenti";
 $a->strings["Permission Denied."] = "Permesso negato.";
 $a->strings["File not found."] = "File non trovato.";
 $a->strings["Edit file permissions"] = "Modifica i permessi del file";
@@ -1252,7 +1218,7 @@ $a->strings["I am online"] = "Sono online";
 $a->strings["Bookmark this room"] = "Aggiungi questa chat ai segnalibri";
 $a->strings["New Chatroom"] = "Nuova chat";
 $a->strings["Chatroom Name"] = "Nome della chat";
-$a->strings["Expiration of chats (minutes)"] = "Scadenza dei messaggi in chat (minuti)";
+$a->strings["Expiration of chats (minutes)"] = "Scadenza dei messaggi della chat (minuti)";
 $a->strings["%1\$s's Chatrooms"] = "Le chat di %1\$s";
 $a->strings["Items tagged with: %s"] = "Elementi taggati con: %s";
 $a->strings["Search results for: %s"] = "Risultati ricerca: %s";
@@ -1281,6 +1247,47 @@ $a->strings["Delete Conversation"] = "Elimina la conversazione";
 $a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Non è disponibile alcun modo sicuro di comunicare con questo canale. <strong>Se possibile</strong>, prova a rispondere direttamente dalla pagina del profilo del mittente.";
 $a->strings["Send Reply"] = "Invia la risposta";
 $a->strings["Your message for %s (%s):"] = "Il tuo messaggio per %s (%s):";
+$a->strings["Page owner information could not be retrieved."] = "Impossibile ottenere informazioni sul proprietario della pagina.";
+$a->strings["Album not found."] = "Album non trovato.";
+$a->strings["Delete Album"] = "Elimina album";
+$a->strings["Delete Photo"] = "Elimina foto";
+$a->strings["No photos selected"] = "Nessuna foto selezionata";
+$a->strings["Access to this item is restricted."] = "Questo elemento non è visibile a tutti.";
+$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "Hai usato %1$.2f Mb dei %2$.2f Mb di spazio disponibile.";
+$a->strings["%1$.2f MB photo storage used."] = "Hai usato %1$.2f Mb del tuo spazio disponibile.";
+$a->strings["Upload Photos"] = "Carica foto";
+$a->strings["Enter an album name"] = "Scegli il nome dell'album";
+$a->strings["or select an existing album (doubleclick)"] = "o seleziona un album esistente (doppio click)";
+$a->strings["Create a status post for this upload"] = "Pubblica sulla bacheca";
+$a->strings["Caption (optional):"] = "Titolo (facoltativo):";
+$a->strings["Description (optional):"] = "Descrizione (facoltativa):";
+$a->strings["Album name could not be decoded"] = "Non è stato possibile leggere il nome dell'album";
+$a->strings["Contact Photos"] = "Foto dei contatti";
+$a->strings["Show Newest First"] = "Prima i più recenti";
+$a->strings["Show Oldest First"] = "Prima i più vecchi";
+$a->strings["View Photo"] = "Guarda la foto";
+$a->strings["Edit Album"] = "Modifica album";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Permesso negato. L'accesso a questo elemento può essere stato limitato.";
+$a->strings["Photo not available"] = "Foto non disponibile";
+$a->strings["Use as profile photo"] = "Usa come foto del profilo";
+$a->strings["Private Photo"] = "Foto privata";
+$a->strings["Previous"] = "Precendente";
+$a->strings["View Full Size"] = "Vedi nelle dimensioni originali";
+$a->strings["Next"] = "Successivo";
+$a->strings["Remove"] = "Rimuovi";
+$a->strings["Edit photo"] = "Modifica la foto";
+$a->strings["Rotate CW (right)"] = "Ruota (senso orario)";
+$a->strings["Rotate CCW (left)"] = "Ruota (senso antiorario)";
+$a->strings["Enter a new album name"] = "Inserisci il nome del nuovo album";
+$a->strings["or select an existing one (doubleclick)"] = "o seleziona uno esistente (doppio click)";
+$a->strings["Caption"] = "Didascalia";
+$a->strings["Add a Tag"] = "Aggiungi tag";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Esempio: @bob, @Barbara_Jensen, @jim@example.com";
+$a->strings["Flag as adult in album view"] = "Marca come 'per adulti'";
+$a->strings["In This Photo:"] = "In questa foto:";
+$a->strings["Map"] = "Mappa";
+$a->strings["View Album"] = "Guarda l'album";
+$a->strings["Recent Photos"] = "Foto recenti";
 $a->strings["Invalid message"] = "Messaggio non valido";
 $a->strings["no results"] = "nessun risultato";
 $a->strings["Delivery report for %1\$s"] = "Rapporto di consegna - %1\$s";
@@ -1484,7 +1491,7 @@ $a->strings["Input type"] = "Tipo di dati";
 $a->strings["Field Name"] = "Nome del campo";
 $a->strings["Label on profile pages"] = "Etichetta da mostrare sulla pagina del profilo";
 $a->strings["Help text"] = "Testo di aiuto";
-$a->strings["Additional info (optional)"] = "Informazioni aggiuntive (opzionali)";
+$a->strings["Additional info (optional)"] = "Informazioni aggiuntive (facoltative)";
 $a->strings["Field definition not found"] = "Impossibile trovare la definizione del campo";
 $a->strings["Edit Profile Field"] = "Modifica campo del profilo";
 $a->strings["App installed."] = "App installata";
@@ -1738,7 +1745,7 @@ $a->strings["Select a profile"] = "Scegli un profilo";
 $a->strings["Post an activity"] = "Pubblica un'attività";
 $a->strings["Only sends to viewers of the applicable profile"] = "Invia solo a chi può vedere il profilo scelto";
 $a->strings["Name of thing e.g. something"] = "Nome dell'oggetto";
-$a->strings["URL of thing (optional)"] = "Indirizzo web dell'oggetto (opzionale)";
+$a->strings["URL of thing (optional)"] = "Indirizzo web dell'oggetto (facoltativo)";
 $a->strings["URL for photo of thing (optional)"] = "Indirizzo di un'immagine dell'oggetto (facoltativo)";
 $a->strings["Add Thing to your Profile"] = "Aggiungi l'oggetto al tuo profilo";
 $a->strings["Total invitation limit exceeded."] = "Hai superato il numero massimo di inviti.";
@@ -1779,7 +1786,7 @@ $a->strings["Consumer Secret"] = "Consumer Secret";
 $a->strings["Redirect"] = "Redirect";
 $a->strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI di riderezione - lasciare vuoto se non richiesto specificamente dall'applicazione";
 $a->strings["Icon url"] = "Url icona";
-$a->strings["Optional"] = "Opzionale";
+$a->strings["Optional"] = "Facoltativo";
 $a->strings["You can't edit this application."] = "Non puoi modificare questa applicazione.";
 $a->strings["Connected Apps"] = "App connesse";
 $a->strings["Client key starts with"] = "La client key inizia con";
@@ -2130,6 +2137,7 @@ $a->strings["Or enter new bookmark folder name"] = "O inserisci il nome di una n
 $a->strings["Import completed"] = "Importazione completata";
 $a->strings["Import Items"] = "Importa i contenuti";
 $a->strings["Use this form to import existing posts and content from an export file."] = "Usa questa funzionalità per importare i vecchi contenuti e i post da un file esportato in precedenza.";
+$a->strings["Who likes me?"] = "Chi mi ha dato un \"Mi piace\"?";
 $a->strings["Focus (Hubzilla default)"] = "Focus (predefinito)";
 $a->strings["Theme settings"] = "Impostazioni del tema";
 $a->strings["Select scheme"] = "Scegli uno schema";

view/theme/redbasic/schema/bluegrid.css

@@ -337,7 +337,7 @@ input {
     background-color: #FFF;
 }
 
-.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit, .profile-edit-submit-wrapper > input.profile-edit-submit-button, input#profile-photo-submit, form#chat-form > input, div#adminpage > form > div.submit > input, input.sources-submit, input.contact-edit-submit {
+.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit, .profile-edit-submit-wrapper > input.profile-edit-submit-button, input#profile-photo-submit, form#chat-form > input, div#adminpage > form > div.submit > input, input.sources-submit, input.contact-edit-submit, input#dbtn-submit {
     background-color: #FFF;
     color: #43488A;
 	border-radius: 0px;
@@ -346,7 +346,7 @@ input {
     transition: all .3s ease-in-out;
 }
 
-.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus, .profile-edit-submit-wrapper > input.profile-edit-submit-button:hover, .profile-edit-submit-wrapper > input.profile-edit-submit-button:focus, input#profile-photo-submit:hover, input#profile-photo-submit:focus, form#chat-form > input:hover, form#chat-form > input:focus, div#adminpage > form > div.submit > input:hover, div#adminpage > form > div.submit > input:focus, input.sources-submit:hover, input.sources-submit:focus, input.contact-edit-submit:focus, input.contact-edit-submit:hover {
+.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus, .profile-edit-submit-wrapper > input.profile-edit-submit-button:hover, .profile-edit-submit-wrapper > input.profile-edit-submit-button:focus, input#profile-photo-submit:hover, input#profile-photo-submit:focus, form#chat-form > input:hover, form#chat-form > input:focus, div#adminpage > form > div.submit > input:hover, div#adminpage > form > div.submit > input:focus, input.sources-submit:hover, input.sources-submit:focus, input.contact-edit-submit:focus, input.contact-edit-submit:hover, input#dbtn-submit:hover, input#dbtn-submit:focus {
     border-color: #FFF;
     background-color: #43488A;
     color: #FFF;

view/theme/redbasic/schema/dark.css

@@ -307,6 +307,11 @@ pre {
     border-color: #222; 
 }
 
+.pmenu-item:hover a {
+	background-color: #333 !important;
+	color: #ddd;
+}
+
 .preview {
 	background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif');
 }

view/tpl/chat.tpl

@@ -1,12 +1,5 @@
 <div class="generic-content-wrapper-styled">
-<h1>{{$room_name}}</h1>
-<div id="chatContainer">
 
-    <div id="chatTopBar">
-    	<div id="chatLineHolder"></div>
-	</div>
-
-	<div id="chatSide">
 	{{if $is_owner}} 
 	<div id="chatDrop">
 	<form id="chat-destroy" method="post" action="chat">
@@ -14,9 +7,20 @@
 		<input type="hidden" name="action" value="drop" />
         <input type="submit" name="submit" value="{{$drop}}" onclick="return confirmDelete();"/>
 	</form>
-	</div><br />		
+	</div>		
 	{{/if}}
 
+<h1>{{$room_name}}</h1>
+
+
+<div id="chatContainer">
+
+    <div id="chatTopBar">
+    	<div id="chatLineHolder"></div>
+	</div>
+
+	<div id="chatSide">
+
     <div id="chatUsers"></div><br />
 	</div>
 	<div class="clear"></div>
@@ -25,14 +29,14 @@
 
         <form id="chat-form" method="post" action="#">
 			<input type="hidden" name="room_id" value="{{$room_id}}" />
-            <textarea id="chatText" name="chat_text" rows=3 cols=80></textarea><br />
+            <textarea id="chatText" name="chat_text" rows=3></textarea><br />
             <input type="submit" name="submit" value="{{$submit}}" />
         </form>
 
-		<a href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave">{{$leave}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away">{{$away}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online">{{$online}}</a>{{if $bookmark_link}} | <a href="{{$bookmark_link}}" target="_blank" >{{$bookmark}}</a>{{/if}}
-
     </div>
-
+	<div id="chatOptionsBar">
+		<a href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave">{{$leave}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away">{{$away}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online">{{$online}}</a>{{if $bookmark_link}} | <a href="{{$bookmark_link}}" target="_blank" >{{$bookmark}}</a>{{/if}}
+	</div>
 </div>
 </div>
 

view/tpl/follow.tpl

@@ -2,7 +2,7 @@
 	<h3>{{$connect}}</h3>
 	<div id="connect-desc">{{$desc}}</div>
 	<form action="follow" method="post" />
-		<input id="side-follow-url" type="text" name="url" size="24" title="{{$hint}}" />
+		<input id="side-follow-url" type="text" name="url" title="{{$hint}}" />
 		<input id="side-follow-submit" type="submit" name="submit" class="btn btn-default" value="{{$follow}}" />
 	</form>
 	{{if $abook_usage_message}}