瀏覽代碼

WIP: apply bootstrap theme

* apply Simple Line Icons
Yuki Takei 8 年之前
父節點
當前提交
f5dd95a9cb

+ 1 - 1
lib/views/admin/app.html

@@ -133,7 +133,7 @@
         {{ t("app_setting.No_SMTP_setting") }}<br>
         {{ t("app_setting.No_SMTP_setting") }}<br>
           <br>
           <br>
 
 
-          <span class="text-danger"><i class="fa fa-warning"></i> {{ t("app_setting.change_setting") }}</span>
+          <span class="text-danger"><i class="ti-unlink"></i> {{ t("app_setting.change_setting") }}</span>
         </p>
         </p>
 
 
         <div class="form-group">
         <div class="form-group">

+ 2 - 2
lib/views/admin/external-accounts.html

@@ -41,7 +41,7 @@
     <div class="col-md-9">
     <div class="col-md-9">
       <p>
       <p>
         <a class="btn btn-default" href="/admin/users">
         <a class="btn btn-default" href="/admin/users">
-          <i class="fa fa-arrow-left" aria-hidden="true"></i>
+          <i class="ti-arrow-left" aria-hidden="true"></i>
           ユーザー管理に戻る
           ユーザー管理に戻る
         </a>
         </a>
       </p>
       </p>
@@ -62,7 +62,7 @@
                   data-animation="false" data-html="true"
                   data-animation="false" data-html="true"
                   data-content="<small>関連付けられているユーザーがパスワードを設定しているかどうかを表示します</small>">
                   data-content="<small>関連付けられているユーザーがパスワードを設定しているかどうかを表示します</small>">
                 <small>
                 <small>
-                  <i class="fa fa-info-circle" aria-hidden="true"></i>
+                  <i class="icon-question" aria-hidden="true"></i>
                 </small>
                 </small>
               </a>
               </a>
             </th>
             </th>

+ 12 - 12
lib/views/admin/notification.html

@@ -38,10 +38,10 @@
 
 
       <ul class="nav nav-tabs" role="tablist">
       <ul class="nav nav-tabs" role="tablist">
         <li class="active">
         <li class="active">
-          <a href="#slack-app" data-toggle="tab" role="tab"><i class="fa fa-slack"></i> Slack App</a>
+          <a href="#slack-app" data-toggle="tab" role="tab"><i class="icon-settings"></i> Slack App</a>
         </li>
         </li>
         <li role="tab">
         <li role="tab">
-          <a href="#slack-incoming-webhooks" data-toggle="tab" role="tab"><i class="fa fa-slack"></i> Slack Incoming Webhooks</a>
+          <a href="#slack-incoming-webhooks" data-toggle="tab" role="tab"><i class="icon-settings"></i> Slack Incoming Webhooks</a>
         </li>
         </li>
       </ul>
       </ul>
 
 
@@ -52,8 +52,8 @@
             <fieldset>
             <fieldset>
               <legend>Slack App Configuration</legend>
               <legend>Slack App Configuration</legend>
 
 
-              <p class="well text-warning">
-                <i class="fa fa-warning"></i> NOT RECOMMENDED
+              <p class="well">
+                <i class="icon-fw icon-exclamation text-danger"></i><span class="text-danger">NOT RECOMMENDED</span>
                 <br><br>
                 <br><br>
                 This is the way that compatible with the official Crowi,<br>
                 This is the way that compatible with the official Crowi,<br>
                 but not recommended in crowi-plus because it is too complex.
                 but not recommended in crowi-plus because it is too complex.
@@ -88,16 +88,16 @@
           <div class="text-center">
           <div class="text-center">
             {% if hasSlackToken %}
             {% if hasSlackToken %}
             <p>Crowi and Slack is already <strong>connected</strong>. You can re-connect to refresh and overwirte the token with your Slack account.</p>
             <p>Crowi and Slack is already <strong>connected</strong>. You can re-connect to refresh and overwirte the token with your Slack account.</p>
-            <a class="btn btn-warning" href="/admin/notification/slackSetting/disconnect">
-              <i class="fa fa-slack"></i> Disconnect from Slack
+            <a class="btn btn-warning btn-rounded" href="/admin/notification/slackSetting/disconnect">
+              <i class="icon-power"></i> Disconnect from Slack
             </a>
             </a>
-            <a class="btn btn-default" href="{{ slackAuthUrl }}" target="_blank">
-              <i class="fa fa-slack"></i> Reconnect to Slack
+            <a class="btn btn-success btn-outline btn-rounded" href="{{ slackAuthUrl }}" target="_blank">
+              <i class="icon-login"></i> Reconnect to Slack
             </a>
             </a>
             {% else %}
             {% else %}
             <p>Slack clientId and clientSecret is configured. Now, you can connect with Slack.</p>
             <p>Slack clientId and clientSecret is configured. Now, you can connect with Slack.</p>
-            <a class="btn btn-primary" href="{{ slackAuthUrl }}" target="_blank">
-              <i class="fa fa-slack"></i> Connect to Slack
+            <a class="btn btn-primary btn-outline2 btn-rounded" href="{{ slackAuthUrl }}" target="_blank">
+              <i class="icon-login"></i> Connect to Slack
             </a>
             </a>
             {% endif %}
             {% endif %}
           </div>
           </div>
@@ -107,7 +107,7 @@
           {# {% if not hasSlackWebClientConfig %} #}
           {# {% if not hasSlackWebClientConfig %} #}
           <hr>
           <hr>
           <h3>
           <h3>
-            <i class="fa fa-question-circle" aria-hidden="true"></i>
+            <i class="icon-question" aria-hidden="true"></i>
             <a href="#collapseHelpForApp" data-toggle="collapse">How to configure Slack App?</a>
             <a href="#collapseHelpForApp" data-toggle="collapse">How to configure Slack App?</a>
           </h3>
           </h3>
 
 
@@ -217,7 +217,7 @@
 
 
           <hr>
           <hr>
           <h3>
           <h3>
-            <i class="fa fa-question-circle" aria-hidden="true"></i>
+            <i class="icon-question" aria-hidden="true"></i>
             <a href="#collapseHelpForIwh" data-toggle="collapse">How to configure Incoming Webhooks?</a>
             <a href="#collapseHelpForIwh" data-toggle="collapse">How to configure Incoming Webhooks?</a>
           </h3>
           </h3>
 
 

+ 7 - 7
lib/views/admin/security.html

@@ -155,7 +155,7 @@
           <p class="alert alert-warning"
           <p class="alert alert-warning"
               {% if !isRestartingServerNeeded %}style="display: none;"{% endif %}>
               {% if !isRestartingServerNeeded %}style="display: none;"{% endif %}>
             <b>
             <b>
-              <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
+              <i class="icon-exclamation" aria-hidden="true"></i>
               Restarting the server is needed.
               Restarting the server is needed.
             </b>
             </b>
             The server is running with Passport authentication mechanism.
             The server is running with Passport authentication mechanism.
@@ -217,26 +217,26 @@
           <p class="alert alert-warning"
           <p class="alert alert-warning"
               {% if !isRestartingServerNeeded %}style="display: none;"{% endif %}>
               {% if !isRestartingServerNeeded %}style="display: none;"{% endif %}>
             <b>
             <b>
-              <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
+              <i class="icon-exclamation" aria-hidden="true"></i>
               Restarting the server is needed.
               Restarting the server is needed.
             </b>
             </b>
             The server is running with Official Crowi authentication mechanism.
             The server is running with Official Crowi authentication mechanism.
           </p>
           </p>
           <ul class="nav nav-tabs" role="tablist" {% if isRestartingServerNeeded %}style="opacity: 0.4;"{% endif %}>
           <ul class="nav nav-tabs" role="tablist" {% if isRestartingServerNeeded %}style="opacity: 0.4;"{% endif %}>
             <li class="active">
             <li class="active">
-              <a href="#passport-ldap" data-toggle="tab" role="tab"><i class="fa fa-sitemap"></i> LDAP</a>
+              <a href="#passport-ldap" data-toggle="tab" role="tab"><i class="icon-organization"></i> LDAP</a>
             </li>
             </li>
             <li>
             <li>
-              <a href="#passport-google-oauth" data-toggle="tab" role="tab"><i class="fa fa-google"></i> Google OAuth</a>
+              <a href="#passport-google-oauth" data-toggle="tab" role="tab"><i class="icon-social-google"></i> Google OAuth</a>
             </li>
             </li>
             <li>
             <li>
-              <a href="#passport-facebook" data-toggle="tab" role="tab"><i class="fa fa-facebook"></i> Facebook</a>
+              <a href="#passport-facebook" data-toggle="tab" role="tab"><i class="icon-social-facebook"></i> Facebook</a>
             </li>
             </li>
             <li>
             <li>
-              <a href="#passport-twitter" data-toggle="tab" role="tab"><i class="fa fa-twitter"></i> Twitter</a>
+              <a href="#passport-twitter" data-toggle="tab" role="tab"><i class="icon-social-twitter"></i> Twitter</a>
             </li>
             </li>
             <li>
             <li>
-              <a href="#passport-github" data-toggle="tab" role="tab"><i class="fa fa-github"></i> Github</a>
+              <a href="#passport-github" data-toggle="tab" role="tab"><i class="icon-social-github"></i> Github</a>
             </li>
             </li>
           </ul>
           </ul>
 
 

+ 5 - 3
lib/views/admin/users.html

@@ -33,9 +33,11 @@
 
 
     <div class="col-md-9">
     <div class="col-md-9">
       <p>
       <p>
-        <button data-toggle="collapse" class="btn btn-default" href="#inviteUserForm">{{ t("user_management.invite_users") }}</button>
-        <a class="btn btn-default" href="/admin/users/external-accounts">
-          <i class="fa fa-user-plus" aria-hidden="true"></i>
+        <button data-toggle="collapse" class="btn btn-default" href="#inviteUserForm">
+          {{ t("user_management.invite_users") }}
+        </button>
+        <a class="btn btn-default btn-outline" href="/admin/users/external-accounts">
+          <i class="icon-user-follow" aria-hidden="true"></i>
           {{ t("user_management.external_account") }}
           {{ t("user_management.external_account") }}
         </a>
         </a>
       </p>
       </p>

+ 8 - 8
lib/views/admin/widget/menu.html

@@ -2,14 +2,14 @@
   {% set current = 'index' %}
   {% set current = 'index' %}
 {% endif  %}
 {% endif  %}
 <ul class="nav nav-pills nav-stacked">
 <ul class="nav nav-pills nav-stacked">
-  <li class="{% if current == 'index'%}active{% endif %}"><a href="/admin"><i class="fa fa-cube"></i> {{ t('Management Wiki Home') }}</a></li>
-  <li class="{% if current == 'app'%}active{% endif %}"><a href="/admin/app"><i class="fa fa-gears"></i>{{ t('App settings') }}</a></li>
-  <li class="{% if current == 'security'%}active{% endif %}"><a href="/admin/security"><i class="fa fa-shield"></i> {{ t('Security settings') }}</a></li>
-  <li class="{% if current == 'markdown'%}active{% endif %}"><a href="/admin/markdown"><i class="fa fa-pencil"></i> {{ t('Markdown settings') }}</a></li>
-  <li class="{% if current == 'customize'%}active{% endif %}"><a href="/admin/customize"><i class="fa fa-object-group"></i> {{ t('Customize') }}</a></li>
-  <li class="{% if current == 'notification'%}active{% endif %}"><a href="/admin/notification"><i class="fa fa-bell"></i> {{ t('Notification settings') }}</a></li>
-  <li class="{% if current == 'user' || current == 'external-account' %}active{% endif %}"><a href="/admin/users"><i class="fa fa-users"></i> {{ t('User management') }}</a></li>
+  <li class="{% if current == 'index'%}active{% endif %}"><a href="/admin"><i class="icon-fw icon-info"></i> {{ t('Management Wiki Home') }}</a></li>
+  <li class="{% if current == 'app'%}active{% endif %}"><a href="/admin/app"><i class="icon-fw icon-settings"></i>{{ t('App settings') }}</a></li>
+  <li class="{% if current == 'security'%}active{% endif %}"><a href="/admin/security"><i class="icon-fw icon-shield"></i> {{ t('Security settings') }}</a></li>
+  <li class="{% if current == 'markdown'%}active{% endif %}"><a href="/admin/markdown"><i class="icon-fw icon-note"></i> {{ t('Markdown settings') }}</a></li>
+  <li class="{% if current == 'customize'%}active{% endif %}"><a href="/admin/customize"><i class="icon-fw icon-wrench"></i> {{ t('Customize') }}</a></li>
+  <li class="{% if current == 'notification'%}active{% endif %}"><a href="/admin/notification"><i class="icon-fw icon-bell"></i> {{ t('Notification settings') }}</a></li>
+  <li class="{% if current == 'user' || current == 'external-account' %}active{% endif %}"><a href="/admin/users"><i class="icon-fw icon-people"></i> {{ t('User management') }}</a></li>
   {% if searchConfigured() %}
   {% if searchConfigured() %}
-  <li class="{% if current == 'search'%}active{% endif %}"><a href="/admin/search"><i class="fa fa-search"></i> 検索管理</a></li>
+  <li class="{% if current == 'search'%}active{% endif %}"><a href="/admin/search"><i class="icon-fw icon-magnifier"></i> 検索管理</a></li>
   {% endif %}
   {% endif %}
 </ul>
 </ul>

+ 1 - 1
lib/views/page_list.html

@@ -23,7 +23,7 @@
           <div class="input-group">
           <div class="input-group">
             <input id="#search-listpage-input" type="text" class="form-control" data-path="{{ path }}" placeholder="Search for...">
             <input id="#search-listpage-input" type="text" class="form-control" data-path="{{ path }}" placeholder="Search for...">
             <span class="input-group-btn">
             <span class="input-group-btn">
-              <button class="btn btn-default"><i class="fa fa-search"></i></button>
+              <button class="btn btn-default"><i class="icon-magnifier"></i></button>
             </span>
             </span>
           </div><!-- /input-group -->
           </div><!-- /input-group -->
           <a class="search-listpage-clear" id="search-listpage-clear"><i class="fa fa-times-circle"></i></a>
           <a class="search-listpage-clear" id="search-listpage-clear"><i class="fa fa-times-circle"></i></a>

+ 1 - 1
resource/js/components/SearchPage/SearchForm.js

@@ -45,7 +45,7 @@ export default class SearchForm extends React.Component {
           />
           />
           <span className="input-group-btn">
           <span className="input-group-btn">
             <button type="submit" className="btn btn-default">
             <button type="submit" className="btn btn-default">
-              <i className="search-top-icon fa fa-search"></i>
+              <i className="search-top-icon icon-magnifier"></i>
             </button>
             </button>
           </span>
           </span>
       </form>
       </form>

+ 10 - 6
resource/js/components/SearchPage/SearchResult.js

@@ -176,7 +176,7 @@ export default class SearchResult extends React.Component {
       }
       }
       return (
       return (
         <div className="content-main">
         <div className="content-main">
-            <i className="fa fa-meh-o" /> No page found with "{this.props.searchingKeyword}"{under}
+            <i className="icon-fw icon-info" /> No page found with "{this.props.searchingKeyword}"{under}
         </div>
         </div>
       );
       );
 
 
@@ -188,8 +188,12 @@ export default class SearchResult extends React.Component {
     if (this.state.deletionMode) {
     if (this.state.deletionMode) {
       deletionModeButtons =
       deletionModeButtons =
       <div className="btn-group">
       <div className="btn-group">
-        <button type="button" className="btn btn-danger btn-xs" onClick={() => this.showDeleteConfirmModal()} disabled={this.state.selectedPages.size == 0}><i className="fa fa-trash-o"/> Delete</button>
-        <button type="button" className="btn btn-default btn-xs" onClick={() => this.handleDeletionModeChange()}><i className="fa fa-undo"/> Cancel</button>
+        <button type="button" className="btn btn-rounded btn-default btn-xs" onClick={() => this.handleDeletionModeChange()}>
+          <i className="icon-action-undo"/> Cancel
+        </button>
+        <button type="button" className="btn btn-rounded btn-danger btn-xs" onClick={() => this.showDeleteConfirmModal()} disabled={this.state.selectedPages.size == 0}>
+          <i className="icon-trash"/> Delete
+        </button>
       </div>
       </div>
       allSelectCheck =
       allSelectCheck =
       <div>
       <div>
@@ -205,8 +209,8 @@ export default class SearchResult extends React.Component {
     else {
     else {
       deletionModeButtons =
       deletionModeButtons =
       <div className="btn-group">
       <div className="btn-group">
-        <button type="button" className="btn btn-default btn-xs" onClick={() => this.handleDeletionModeChange()}>
-          <i className="fa fa-toggle-off"/> DeletionMode
+        <button type="button" className="btn btn-default btn-outline btn-rounded btn-xs" onClick={() => this.handleDeletionModeChange()}>
+          <i className="ti-check-box"/> DeletionMode
         </button>
         </button>
       </div>
       </div>
     }
     }
@@ -251,7 +255,7 @@ export default class SearchResult extends React.Component {
                 {allSelectCheck}
                 {allSelectCheck}
               </div>
               </div>
               <div className="search-result-meta">
               <div className="search-result-meta">
-                <i className="fa fa-lightbulb-o" /> Found {this.props.searchResultMeta.total} pages with "{this.props.searchingKeyword}"
+                <i className="icon-bulb" /> Found {this.props.searchResultMeta.total} pages with "{this.props.searchingKeyword}"
               </div>
               </div>
               <div className="clearfix"></div>
               <div className="clearfix"></div>
               <ul className="page-list-ul page-list-ul-flat nav">
               <ul className="page-list-ul page-list-ul-flat nav">

+ 1 - 1
resource/js/util/markdown-it/toc-and-anchor.js

@@ -12,7 +12,7 @@ export default class TocAndAnchorConfigurer {
         tocLastLevel: 3,
         tocLastLevel: 3,
         anchorLinkBefore: false,
         anchorLinkBefore: false,
         anchorLinkSymbol: '',
         anchorLinkSymbol: '',
-        anchorLinkSymbolClassName: 'ti-link',
+        anchorLinkSymbolClassName: 'icon-link',
         anchorClassName: 'revision-head-link',
         anchorClassName: 'revision-head-link',
         slugify: this.customSlugify,
         slugify: this.customSlugify,
       })
       })