fixed email/page number position and added option for no websiteHEADmaster

1 files changed, 23 insertions, 23 deletions

diff --git a/beamerthemeOptics.sty b/beamerthemeOptics.sty
index 34888ab..1b1740d 100644
--- a/beamerthemeOptics.sty
+++ b/beamerthemeOptics.sty
@@ -56,36 +56,36 @@
     \begin{minipage}[c]{0.33\paperwidth}%
       \color{darkblue}\hspace{1em}\insertsection%
     \end{minipage}%
-      \begin{minipage}[c]{0.34\paperwidth}%
-      \ifnum\value{framenumber}>1% Only show author after title page
-      \color{darkblue}
-      \centering
-      \insertwebsite%
-  \fi
-    \end{minipage}%
-    % \begin{minipage}[c]{0.34\paperwidth}%
-    %       \color{darkblue}\hspace{1em}%
-    %   \ifx\insertwebsite\empty%
-    %   \else%
-    %     \href{\insertwebsite}{\insertwebsite}%
-    %   \fi%
-    % \end{minipage}%
-    \begin{minipage}[c]{0.33\paperwidth}%
-      \raggedleft%
+    \begin{minipage}[c]{0.67\paperwidth}%
       \ifnum\value{framenumber}>1% Only show author after title page
         \color{darkblue}%
-        \ifx\insertemail\empty%
-          \insertauthor\hspace{1em}%
+        \ifx\insertwebsitename\empty%
+          % No website: flush author right
+          \raggedleft%
+          \ifx\insertemail\empty%
+            \insertauthor\hspace{1em}%
+          \else%
+              \href{mailto:\insertemail}{\faEnvelope\ \insertauthor\hspace{1em}}%
+          \fi%
         \else%
-              \href{mailto:\insertemail}{\faEnvelope\ \insertauthor}\hspace{1em}%
+          % Website exists: center website, then flush author right
+          \begin{minipage}[c]{0.5\linewidth}%
+            \centering%
+            \insertwebsite%
+          \end{minipage}%
+          \begin{minipage}[c]{0.5\linewidth}%
+            \raggedleft%
+            \ifx\insertemail\empty%
+              \insertauthor\hspace{1em}%
+            \else%
+              \href{mailto:\insertemail}{\faEnvelope\ \insertauthor\hspace{1em}}%
+            \fi%
+          \end{minipage}%
         \fi%
       \fi%
     \end{minipage}%
   \end{beamercolorbox}%
   \vskip0pt%
-  % \begin{beamercolorbox}[wd=\paperwidth,ht=0.5pt]{primary}%
-  %   \color{darkblue}\hrule height 0.5pt%
-  % \end{beamercolorbox}%
 }
 
 
@@ -151,7 +151,7 @@
     \end{minipage}%
     \begin{minipage}[c]{0.33\paperwidth}%
       \raggedleft%
-      \insertframenumber{} / \inserttotalframenumber\hspace{1em}%
+      \insertframenumber{} / \inserttotalframenumber \hspace*{1em}%
     \end{minipage}%
   \end{beamercolorbox}%
 }