From 25f70660cc55226a07c377398efd925a22a14319 Mon Sep 17 00:00:00 2001 From: opi Date: Wed, 7 May 2014 15:23:16 +0200 Subject: [PATCH] [fix] Use font-awesome instead of glyphicons. --- index.html | 2 +- views/app_access.ms | 12 +++++---- views/app_info.ms | 12 ++++++--- views/app_install.ms | 4 ++- views/app_list.ms | 23 ++++++++++------ views/domain_add.ms | 4 ++- views/domain_list.ms | 12 ++++++--- views/home.ms | 17 +++++------- views/login.ms | 16 ++++++++---- views/monitor.ms | 14 +++++----- views/postinstall.ms | 59 ++++++++++++++++++++++++------------------ views/service_info.ms | 14 +++++----- views/service_list.ms | 7 ++--- views/service_log.ms | 4 ++- views/tools_adminpw.ms | 4 ++- views/tools_list.ms | 9 ++++--- views/user_create.ms | 4 ++- views/user_edit.ms | 4 ++- views/user_info.ms | 12 ++++++--- views/user_list.ms | 15 ++++++----- 20 files changed, 153 insertions(+), 95 deletions(-) diff --git a/index.html b/index.html index 44d5315e..e530fde9 100644 --- a/index.html +++ b/index.html @@ -12,7 +12,7 @@
-
+

YunoHost Administration

Logout
diff --git a/views/app_access.ms b/views/app_access.ms index 244cc194..704e3845 100644 --- a/views/app_access.ms +++ b/views/app_access.ms @@ -1,5 +1,7 @@
- {{settings.label}} + + {{settings.label}} +
@@ -17,7 +19,7 @@ {{#each settings.allowed_users}}
- Remove access + Remove access

{{fullname}} ({{mail}})

View {{username}}'s profile @@ -70,7 +72,7 @@ All existing users will have access to {{settings.label}}.

- Add access to all + Add access to all
@@ -81,7 +83,7 @@ No users will have access to {{settings.label}}.

- Remove all access + Remove all access
@@ -92,7 +94,7 @@ Every user will have access to {{settings.label}}.

- Clear all access + Clear all access {{/unless}} diff --git a/views/app_info.ms b/views/app_info.ms index a5096cb3..750d362c 100644 --- a/views/app_info.ms +++ b/views/app_info.ms @@ -1,8 +1,12 @@
- App list + + App list +
- Access + + Access +
{{settings.label}}
@@ -34,5 +38,7 @@
- Uninstall + + Uninstall +
diff --git a/views/app_install.ms b/views/app_install.ms index b56dd794..6531c980 100644 --- a/views/app_install.ms +++ b/views/app_install.ms @@ -1,5 +1,7 @@
- App list + + App list +
Install {{manifest.name}}
diff --git a/views/app_list.ms b/views/app_list.ms index 2b9683e7..9f8c37ce 100644 --- a/views/app_list.ms +++ b/views/app_list.ms @@ -1,9 +1,13 @@ {{#Installed}}
- Menu + + Menu +
- Install + + Install +
Installed apps
@@ -12,10 +16,14 @@ {{^Installed}}
- Installed apps + + Installed apps +
- Refresh list + + Refresh list +
Available apps
@@ -26,16 +34,15 @@
{{#Apps}} -

{{Name}} {{ID}}

- -
+ +

{{Name}} {{ID}}

{{Description.en}}

 {{/Apps}} {{^Apps}}
- + No installed apps.
{{/Apps}} diff --git a/views/domain_add.ms b/views/domain_add.ms index 19555413..42d5a6fd 100644 --- a/views/domain_add.ms +++ b/views/domain_add.ms @@ -1,5 +1,7 @@
- Domain list + + Domain list +
Add domain
diff --git a/views/domain_list.ms b/views/domain_list.ms index 72f7ddac..11d478d1 100644 --- a/views/domain_list.ms +++ b/views/domain_list.ms @@ -1,8 +1,12 @@
- Menu + + Menu +
- Add domain + + Add domain +
Domains
@@ -13,11 +17,11 @@
{{#if main}} - Default + Default {{else}} - Delete + Delete {{/if}}

{{url}}

diff --git a/views/home.ms b/views/home.ms index 435c4c66..20ef4d3b 100644 --- a/views/home.ms +++ b/views/home.ms @@ -1,17 +1,14 @@ -
- - Logout - -

YunoHost Administration

-
+
+

YunoHost Administration

+ Logout +
{{#links}} - +

{{name}}

- -
- + + {{/links}}
diff --git a/views/login.ms b/views/login.ms index d8dbb2d8..585f2761 100644 --- a/views/login.ms +++ b/views/login.ms @@ -3,14 +3,20 @@
-
- - +
- - + +

diff --git a/views/monitor.ms b/views/monitor.ms index 16ca8708..942019b7 100644 --- a/views/monitor.ms +++ b/views/monitor.ms @@ -1,5 +1,7 @@
- Menu + + Menu +
Monitoring
@@ -8,7 +10,7 @@ {{#if status}}
-

Infos

+

Infos

    @@ -24,7 +26,7 @@

    - + System

    @@ -108,7 +110,7 @@

    - + Network

    @@ -176,7 +178,7 @@

    - + Disk

    @@ -227,7 +229,7 @@ {{else}}
    - + Monitoring is not enabled.
    Check glances service status. diff --git a/views/postinstall.ms b/views/postinstall.ms index fe2d1e73..cfe75717 100644 --- a/views/postinstall.ms +++ b/views/postinstall.ms @@ -4,9 +4,7 @@

    A last step is necessary to fulfill the installation: You have to link your YunoHost instance to a domain name, and set a new administrator password.

    -

    Domain

    -
    @@ -19,12 +17,16 @@
    ... and I have set my DNS correctly. -
    +
    - -
    - - + Domain name +
    +
    + + +
    @@ -41,13 +43,17 @@
    ... and I want a dynamic DNS service. -
    +
    - + Domain name
    -
    - - +
    +
    + + +
    -
    -
    +
    +
    -
    - -
    - +
    + +
    + +
    -
    -
    +
    + +
    + +
    +
    + +
    +
    diff --git a/views/service_info.ms b/views/service_info.ms index 432e1017..b5c2c6c8 100644 --- a/views/service_info.ms +++ b/views/service_info.ms @@ -1,5 +1,7 @@
    - Services list + + Services list +
    {{service.name}}
    @@ -24,27 +26,27 @@
    {{#is_loaded}} - Disable + Disable {{/is_loaded}} {{^is_loaded}} - Enable + Enable {{/is_loaded}} {{#is_running}} - Stop + Stop {{/is_running}} {{^is_running}} - Start + Start {{/is_running}} - Log + Log
    diff --git a/views/service_list.ms b/views/service_list.ms index e9e47d09..5452515d 100644 --- a/views/service_list.ms +++ b/views/service_list.ms @@ -1,5 +1,7 @@
    - Menu + + Menu +
    Services
    @@ -8,9 +10,8 @@
    {{#services}} - +

    {{name}}

    -
    Status: diff --git a/views/service_log.ms b/views/service_log.ms index 938b9de5..cc1b2f3f 100644 --- a/views/service_log.ms +++ b/views/service_log.ms @@ -1,5 +1,7 @@
    - {{name}} + + {{name}} +
    {{name}} log
    diff --git a/views/tools_adminpw.ms b/views/tools_adminpw.ms index f2813dc0..b997166f 100644 --- a/views/tools_adminpw.ms +++ b/views/tools_adminpw.ms @@ -1,5 +1,7 @@
    - Tools + + Tools +
    Change administration password
    diff --git a/views/tools_list.ms b/views/tools_list.ms index 545ce8a0..969e2389 100644 --- a/views/tools_list.ms +++ b/views/tools_list.ms @@ -1,5 +1,7 @@
    - Menu + + Menu +
    Tools
    @@ -9,9 +11,8 @@
    {{#links}} -

    {{name}}

    - -
    + +

    {{name}}

     {{/links}}
    diff --git a/views/user_create.ms b/views/user_create.ms index ebdcf573..07e818e2 100644 --- a/views/user_create.ms +++ b/views/user_create.ms @@ -1,5 +1,7 @@
    - User list + + User list +
    New user
    diff --git a/views/user_edit.ms b/views/user_edit.ms index d92cb567..5dce53a8 100644 --- a/views/user_edit.ms +++ b/views/user_edit.ms @@ -1,5 +1,7 @@
    - Info + + Info +
    Edit {{Username}}
    diff --git a/views/user_info.ms b/views/user_info.ms index 3f810317..d5ed97f8 100644 --- a/views/user_info.ms +++ b/views/user_info.ms @@ -1,8 +1,12 @@
    - User list + + User list +
    - Edit + + Edit +
    {{Username}}
    @@ -34,5 +38,7 @@
- Delete + + Delete +
diff --git a/views/user_list.ms b/views/user_list.ms index d7671715..63d537df 100644 --- a/views/user_list.ms +++ b/views/user_list.ms @@ -1,8 +1,12 @@
- Menu + + Menu +
- New user + + New user +
Users
@@ -10,10 +14,9 @@
{{#Users}} - -

{{Username}} {{Fullname}}

- -
+ + +

{{Username}} {{Fullname}}

{{Mail}}

 {{/Users}}