diff --git a/UI/Templates/MailerUI/UIxMailAccountView.wox b/UI/Templates/MailerUI/UIxMailAccountView.wox deleted file mode 100644 index 269472a12..000000000 --- a/UI/Templates/MailerUI/UIxMailAccountView.wox +++ /dev/null @@ -1,58 +0,0 @@ - - -
-

- SOGo Mail - - - - - - - -

- -
- - -
-
- -

Email

-

-
-
-

- -

Accounts

-

- View settings for this account
- Create a new account [TBD: not in Agenor]
-

- -

Advanced Features

-

- Search messages
- Manage message filters
- Manage folder subscriptions
- Offline settings [TBD: not in Agenor]
-

-
-
diff --git a/UI/Templates/MailerUI/UIxMailAccountViewContainer.wox b/UI/Templates/MailerUI/UIxMailAccountViewContainer.wox deleted file mode 100644 index ae4f93ec7..000000000 --- a/UI/Templates/MailerUI/UIxMailAccountViewContainer.wox +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - -
- -
- - -
- - - - -
diff --git a/UI/Templates/MailerUI/UIxMailAccountsView.wox b/UI/Templates/MailerUI/UIxMailAccountsView.wox deleted file mode 100644 index 1fa717274..000000000 --- a/UI/Templates/MailerUI/UIxMailAccountsView.wox +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - -
-
- -
-
-
diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox index 01945e49d..97c87337f 100644 --- a/UI/Templates/MailerUI/UIxMailEditor.wox +++ b/UI/Templates/MailerUI/UIxMailEditor.wox @@ -6,7 +6,7 @@ xmlns:uix="OGo:uix" xmlns:rsrc="OGo:url" xmlns:label="OGo:label" - className="UIxMailMainFrame" + className="UIxPageFrame" title="panelTitle" const:popup="YES" > diff --git a/UI/Templates/MailerUI/UIxMailFilterPanel.wox b/UI/Templates/MailerUI/UIxMailFilterPanel.wox index 17ae1818e..0e3805a46 100644 --- a/UI/Templates/MailerUI/UIxMailFilterPanel.wox +++ b/UI/Templates/MailerUI/UIxMailFilterPanel.wox @@ -42,11 +42,6 @@ onkeydown="onSearchKeyDown(this);" /> - - - - TODO: IMAP4 ACL editor - + + TODO: IMAP4 ACL editor + diff --git a/UI/Templates/MailerUI/UIxMailListView.wox b/UI/Templates/MailerUI/UIxMailListView.wox index 85d3b958e..a66e0d832 100644 --- a/UI/Templates/MailerUI/UIxMailListView.wox +++ b/UI/Templates/MailerUI/UIxMailListView.wox @@ -1,159 +1,133 @@ - - - - - - + + + - - - - -
- +
+
+ | + | + + + + + + + | +
- | - | - - - - - - - | -
- -
+ + + diff --git a/UI/Templates/MailerUI/UIxMailListViewContainer.wox b/UI/Templates/MailerUI/UIxMailListViewContainer.wox deleted file mode 100644 index 01017ac79..000000000 --- a/UI/Templates/MailerUI/UIxMailListViewContainer.wox +++ /dev/null @@ -1,30 +0,0 @@ - - - -
- -
- -
- -
-
- - -
- - - - -
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox index e460a06bc..4c1afc879 100644 --- a/UI/Templates/MailerUI/UIxMailMainFrame.wox +++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox @@ -8,265 +8,216 @@ title="title" popup="isPopup" > - - + - + - + - + + + - + - + - + - + - +
    +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
+ + +
+
+ +
- - -
- - -
-
- -
- -
-
- -
- -
-
- - - - -
+
- -
- - - - +
+ + +
+
+
+ +
+ + +
diff --git a/UI/Templates/MailerUI/UIxMailPopupView.wox b/UI/Templates/MailerUI/UIxMailPopupView.wox new file mode 100644 index 000000000..6b892b56a --- /dev/null +++ b/UI/Templates/MailerUI/UIxMailPopupView.wox @@ -0,0 +1,11 @@ + + + + diff --git a/UI/Templates/MailerUI/UIxMailSplashView.wox b/UI/Templates/MailerUI/UIxMailSplashView.wox new file mode 100644 index 000000000..26cef689e --- /dev/null +++ b/UI/Templates/MailerUI/UIxMailSplashView.wox @@ -0,0 +1,43 @@ + +
+

+ SOGo Mail - + + + + + +

+ +
+ + +
+
+ +

Email

+

+
+
+

+ +

Accounts

+

+ View settings for this account
+ Create a new account [TBD: not in Agenor]
+

+ +

Advanced Features

+

+ Search messages
+ Manage message filters
+ Manage folder subscriptions
+ Offline settings [TBD: not in Agenor]
+

+
diff --git a/UI/Templates/MailerUI/UIxMailTree.wox b/UI/Templates/MailerUI/UIxMailTree.wox index 250e87f8b..1bcfe7d1b 100644 --- a/UI/Templates/MailerUI/UIxMailTree.wox +++ b/UI/Templates/MailerUI/UIxMailTree.wox @@ -7,7 +7,7 @@ xmlns:label="OGo:label"> - + diff --git a/UI/Templates/MailerUI/UIxMailTreeBlockJS.wox b/UI/Templates/MailerUI/UIxMailTreeBlockJS.wox index 0ffd12900..d63a075a5 100644 --- a/UI/Templates/MailerUI/UIxMailTreeBlockJS.wox +++ b/UI/Templates/MailerUI/UIxMailTreeBlockJS.wox @@ -3,5 +3,5 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:var="http://www.skyrix.com/od/binding" xmlns:const="http://www.skyrix.com/od/constant" - >.add(, , '', , '#', 'onMailboxTreeItemClick(this);', '', '', '', '', '', ''); + >.add(, , '', , '#', '', '', '', '', '', ''); diff --git a/UI/Templates/MailerUI/UIxMailView.wox b/UI/Templates/MailerUI/UIxMailView.wox index dd4f45e20..07966734c 100644 --- a/UI/Templates/MailerUI/UIxMailView.wox +++ b/UI/Templates/MailerUI/UIxMailView.wox @@ -1,84 +1,75 @@ - - - - + xmlns:label="OGo:label"> +
+ + + + + + + + + + + + + + + + + + - - - - - + - - - - - - - - - - - - - - - - -
: + +
: + + + + +
: + + + +
: + + + +
: - -
:: - - - - -
: - - - -
: - - +
: - - - - -
-
+ +
diff --git a/UI/Templates/MailerUI/UIxMailViewContainer.wox b/UI/Templates/MailerUI/UIxMailViewContainer.wox deleted file mode 100644 index 9d7f1cfb0..000000000 --- a/UI/Templates/MailerUI/UIxMailViewContainer.wox +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - -
- -
- -
- - - - -
diff --git a/UI/Templates/MailerUI/UIxSieveEditor.wox b/UI/Templates/MailerUI/UIxSieveEditor.wox index 56f4f5028..138ddad1a 100644 --- a/UI/Templates/MailerUI/UIxSieveEditor.wox +++ b/UI/Templates/MailerUI/UIxSieveEditor.wox @@ -6,7 +6,7 @@ xmlns:uix="OGo:uix" xmlns:rsrc="OGo:url" xmlns:label="OGo:label" - className="UIxMailMainFrame" + className="UIxPageFrame" title="panelTitle" const:hideFolderTree="1" >