Merge branch 'dev' of github.com:Parisson/Telemeta-doc into dev

Conflicts:
	Conferences/2015_FMA/slides_FMA_2015.tex

diff --cc Conferences/2015_FMA/slides_FMA_2015.tex
index c7a82e2150e1ebb56abcc6a488ac086ab1851515,697e492ec9febcfac0154f0c56b55fefce92d948..635a20e3e024eeb3c03e0f58e336f54eafb54b51
--- 1/Conferences/2015_FMA/slides_FMA_2015.tex
--- 2/Conferences/2015_FMA/slides_FMA_2015.tex
+++ b/Conferences/2015_FMA/slides_FMA_2015.tex
@@@ -204,9 -194,17 +204,9 @@@
        \item \alert{User management} with individual desk, playlists, profiles
          and group access rights.
        \item \alert{High level search engine} (text, dates, locations, instruments, ethnic groups, etc...).
-       \item \alert{Multi-language support} (currently english, german, arab, chinese and french).
 -      \item \hyperlink{telemeta_languages}{Multi-language support (currently english, german, french, chinese, arabic and portuguese).}
++      \item \hyperlink{telemeta_languages}{\alert{Multi-language support} support (currently english, german, french, chinese, arabic and portuguese).}
        \end{itemize}
 -  \end{block}
 -\end{frame}
 -
 -
 -\begin{frame}[plain]{Telemeta \emph{Item} page}
 -  \begin{center}
 -    \fbox{\includegraphics[width=\linewidth]{img/telemeta_screenshot_en_2.png}}
 -  \end{center}
 -
 +    \end{block}
  \end{frame}
  
  
@@@ -563,94 -547,76 +563,152 @@@ Future developments will turn Telemeta 
      \item an \alert{social and collaborative platform} (user access managment and social stuff)
      \item an \alert{interdisciplinary} collaborative platform between IT and ethno with the joint develoment of automatic analysis and indexation tools
      \end{itemize}
- 
- Regarding TimeSide, a Web-API is being developed to provide audio analysis services over the web. 
    \end{block}
  \end{frame}
 +
+ \begin{frame}{Thank You !}
+   \begin{itemize}
+   \item Contact: \url{guillaume.pellerin@parisson.com}
+   \item Telemeta:
+     \begin{center}
+     \includegraphics[width=0.4\textwidth]{img/logo_telemeta_1-1.pdf}\\
+       \colorbox{yellow!40}{\textbf{\url{http://telemeta.org}}}\\
+       \colorbox{yellow!40}{\href{https://twitter.com/telemeta/}{@telemeta}}
+     \end{center}
+ 
+   \item Github:
+     \begin{itemize}
+     \item \colorbox{yellow!40}{\bf
+         \url{https://github.com/parisson/TimeSide/}}
+     \item \colorbox{yellow!40}{\bf
+         \url{https://github.com/parisson/Telemeta/}}
+     \end{itemize}
++\end{frame}
  
 -  \end{itemize}
 +\begin{frame}{The End}
 + \begin{center}
 +   \large{Thank you!}\\
 +   \large{We are looking for new patners and projects...\\ let's keep in touch!}   
 +    \begin{block}{Links}
 +     \begin{itemize}\small
 +        \item \chref{http://telemeta.org}{telemeta.org}
 +        \item \chref{https://twitter.com/telemeta/}{@telemeta}
 +        \item \chref{http://github.com/Parisson/}{github.com/Parisson/}
 +    \end{itemize}
 +    \end{block}
 +    \begin{block}{Contact us}
 +    \begin{itemize}\small
 +    \item \chref{mailto:guillaume@parisson.com}{guillaume@parisson.com}, \chref{mailto:thomas@parisson.com}{thomas@parisson.com}
 +    \item \chref{https://twitter.com/yomguy/}{@yomguy}
 +    \item \chref{https://plus.google.com/u/0/+GuillaumePellerin/posts}{+GuillaumePellerin}
 +    \item \chref{http://fr.linkedin.com/in/guillaumepellerin}{fr.linkedin.com/in/guillaumepellerin}
 +    \end{itemize}
 +     \end{block}
 +  \end{center}
  \end{frame}
  
  \appendix
  \section{Additional Materials}
  
-     
 +
 +    \begin{frame}{Sponsors}
 +
 +
 +        \begin{center}
 +        \begin{columns}[c]
 +        \column{2.5cm}
 +        \begin{center}
 +            \pgfimage[width=2cm]{img/logo-ANR}
 +        \end{center}
 +        \column{2.5cm}
 +        \begin{center}
 +            \pgfimage[width=1.5cm]{img/logo-CNRS-big}
 +        \end{center}
 +        \column{2.5cm}
 +        \begin{center}
 +            \pgfimage[width=2.5cm]{img/Logo_UPX_big}
 +        \end{center}
 +        \column{2cm}
 +        \begin{center}
 +            \pgfimage[width=2cm]{img/upmc}
 +        \end{center}
 +        \end{columns}
 +        \end{center}
 +
 +        \begin{center}
 +        \begin{columns}[c]
 +        \column{2.5cm}
 +        \begin{center}
 +            \pgfimage[width=1.5cm]{img/logo_mcc_3}
 +        \end{center}
 +        \column{2.5cm}
 +        \begin{center}
 +            \pgfimage[width=1.5cm]{img/logo-MNHN-big}
 +        \end{center}
 +        \column{2.5cm}
 +        \begin{center}
 +            \pgfimage[width=1.5cm]{img/logohumanum-web-grand-rvb}
 +        \end{center}
 +        \column{2cm}
 +        \begin{center}
 +            \pgfimage[width=2.5cm]{img/parisson_logo_200}
 +        \end{center}
 +        \end{columns}
 +        \end{center}
 +
 +        
 +        \begin{center}
 +            \pgfimage[width=4.5cm]{img/europeana-sounds_0}
 +        \end{center}
 +        
 +    \end{frame}
 +    
 +    
+ \subsubsection{Telemeta - Geographic Navigator}
+ \begin{frame}[plain, label=geonavigator]{Telemeta - Geographic Navigator}
+   \begin{center}
+     \fbox{\includegraphics[width=\linewidth]{img/telemeta_geo.png}}
+   \end{center}
+ \hyperlink{telemeta_features}{\beamerbutton{back}}
+ \end{frame}
+ \subsubsection{Multi language support}
+ \begin{frame}[label=telemeta_languages]{Telemeta - Multi language support}
+ \only<1>{\framesubtitle{English}}
+ \only<2>{\framesubtitle{French}}
+ \only<3>{\framesubtitle{German}}
+ \only<4>{\framesubtitle{Chinese}}
+ \only<5>{\framesubtitle{Arabic}}
+ \only<5>{\framesubtitle{Portuguese}}
+ 
+   \begin{center}
+     \includegraphics<1>[width=1.1\textwidth]{img/telemeta_english.png}
+     \includegraphics<2>[width=1.1\textwidth]{img/telemeta_french.png}
+     \includegraphics<3>[width=1.1\textwidth]{img/telemeta_german.png}
+     \includegraphics<4>[width=1.1\textwidth]{img/telemeta_chinese.png}
+     \includegraphics<5>[width=1.1\textwidth]{img/telemeta_arabic.png}
+     \includegraphics<6>[width=1.1\textwidth]{img/telemeta_portuguese.png}
  
+   \end{center}
+ \hyperlink{telemeta_features}{\beamerbutton{back}}
+ \end{frame}
+ \subsubsection{Metadata}
+ \begin{frame}[label=metadata_example]{Contextual Information example: Collection}
+   \begin{center}
+     \includegraphics[width=1\textwidth]{img/telemeta_metadata_collection.png}
+   \end{center}
+ \href{http://archives.crem-cnrs.fr/archives/collections/CNRSMH_E_1998_017_001/}{\beamerbutton{Online}}
+  \href{./captures/Collection.html}{\beamerbutton{Offline}}
+ \hyperlink{telemeta_metadata}{\beamerbutton{back}}
+ \end{frame}
+ \begin{frame}{Contextual Information example: Item}
+   \begin{center}
+     \includegraphics[width=1\textwidth]{img/telemeta_metadata_item.png}
+   \end{center}
+   \href{http://archives.crem-cnrs.fr/archives/items/CNRSMH_E_1998_017_001_001_01/}{\beamerbutton{Online}}
+  \href{./captures/Item.html}{\beamerbutton{Offline}}
+ \hyperlink{telemeta_metadata}{\beamerbutton{back}}
+ \end{frame}
 +
  %%% Local Variables: 
  %%% mode: latex
  %%% TeX-master: t