Fix settings name

Author: webdevstar

locales/admin/en.json

@@ -246,5 +246,6 @@
   "orders_search": "Search orders",
   "pageNotFound": "Page not found!",
   "skuTaken": "Product SKU must be unique",
-  "product_options": "Options"
+  "product_options": "Options",
+  "logo": "Logo"
 }

package.json

@@ -53,7 +53,7 @@
     "babel-preset-latest": "^6.24.0",
     "babel-preset-react": "^6.23.0",
     "body-parser": "^1.16.1",
-    "cezerin-client": "^0.4.40",
+    "cezerin-client": "^0.4.41",
     "cookie-parser": "^1.4.3",
     "css-loader": "^0.28.0",
     "express": "^4.15.1",

public/admin-assets/css/style.css

@@ -59,7 +59,9 @@ body, button, input, select, textarea {
   padding: 20px 0 5px 0;
 }
 
-.mce-content-body {}
+.mce-content-body {
+  border-bottom: 1px solid rgb(224, 224, 224);
+}
 
 .mce-edit-focus {}
 
@@ -84,3 +86,8 @@ body, button, input, select, textarea {
   color: rgba(0, 0, 0, 0.4);
   font-size: 16px;
 }
+
+.paper-box {
+  margin: 20px;
+  text-align: left;
+}

src/admin/client/index.js

@@ -28,7 +28,8 @@ import layoutCustomerEdit from 'layouts/customers/edit'
 import layoutCustomerGroups from 'layouts/customers/groups'
 import layoutOrders from 'layouts/orders'
 import layoutSettingsShared from 'layouts/settings/shared'
-import layoutSettingsGeneral from 'layouts/settings/general'
+import layoutSettingsGeneral from 'layouts/settings/general/index'
+import layoutSettingsGeneralLogo from 'layouts/settings/general/logo'
 import layoutSettingsEmail from 'layouts/settings/email/index'
 import layoutSettingsSmtp from 'layouts/settings/email/smtp'
 import layoutSettingsEmailTemplates from 'layouts/settings/email/templates'
@@ -162,6 +163,7 @@ ReactDOM.render(
         <Route path="settings" component={layoutSettingsShared}>
           <IndexRoute component={layoutSettingsGeneral}/>
           <Route path="general" component={layoutSettingsGeneral}/>
+          <Route path="general/logo" component={layoutSettingsGeneralLogo}/>
           <Route path="theme" component={layoutSettingsThemes}/>
           <Route path="shipping" component={layoutSettingsShipping}/>
           <Route path="shipping/add" component={layoutSettingsShippingAdd}/>

…admin/client/layouts/settings/general.js …client/layouts/settings/general/index.jssrc/admin/client/layouts/settings/general.js renamed to src/admin/client/layouts/settings/general/index.js src/admin/client/layouts/settings/general.js renamed to src/admin/client/layouts/settings/general/index.js

@@ -0,0 +1,6 @@
+import React from 'react'
+import GeneralLogoSettings from 'modules/settings/generalLogo'
+
+export default() => (
+  <GeneralLogoSettings />
+)

src/admin/client/layouts/settings/general/logo.js

@@ -33,7 +33,7 @@ const SettingsMenu = () => (
 
 export default({children}) => (
   <div className="row row--no-gutter col-full-height">
-    <div className="col-xs-3 col--no-gutter scroll col-full-height right-border">
+    <div className="col-xs-3 col--no-gutter scroll col-full-height">
       <SettingsMenu/>
     </div>
     <div className="col-xs-9 col--no-gutter scroll col-full-height">

src/admin/client/layouts/settings/shared.js

@@ -206,6 +206,10 @@ export default class AppBarTop extends React.Component {
     else if(location === '/admin/settings/general' || location === '/admin/settings'){
       title = messages.settings_generalSettings;
     }
+    else if(location === '/admin/settings/general/logo'){
+      title = messages.logo;
+      leftButton = <Link to="/admin/settings/general"><IconButton><FontIcon color="#fff" className="material-icons">arrow_back</FontIcon></IconButton></Link>
+    }
     else if(location === '/admin/settings/pages'){
       title = messages.settings_pages;
     }

src/admin/client/modules/app/head/components/appBar.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { Field, reduxForm } from 'redux-form'
-import { TextField, Toggle } from 'redux-form-material-ui'
+import { TextField } from 'redux-form-material-ui'
 
 import messages from 'lib/text'
 import style from './style.css'
@@ -42,7 +42,7 @@ class Form extends React.Component {
     }
 
     return (
-      <Paper className={style.form} zDepth={1}>
+      <Paper className="paper-box" zDepth={1}>
         <form onSubmit={handleSubmit}>
           <div className={style.innerBox}>
             <Field name="name" component={TextField} floatingLabelText={messages.customerGroups_name+' *'} fullWidth={true}/><br />

src/admin/client/modules/customer-groups/edit/components/form.js

@@ -1,8 +1,3 @@
-.form {
-  margin: 20px;
-  text-align: left;
-}
-
 .shortBox {
   max-width: 300px;
 }