Merge branch 'title-tags' into 'master'
feat: Use consistent title tags and pull from i18n See merge request mythic-insight/legendary!7
This commit is contained in:
		
						commit
						677febefde
					
				
					 6 changed files with 9 additions and 6 deletions
				
			
		| 
						 | 
					@ -4,7 +4,7 @@
 | 
				
			||||||
    <meta charset="utf-8"/>
 | 
					    <meta charset="utf-8"/>
 | 
				
			||||||
    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 | 
					    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 | 
				
			||||||
    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 | 
					    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 | 
				
			||||||
    <title>Admin · Phoenix Framework</title>
 | 
					    <title><%= I18n.t! "en", "site.title" %></title>
 | 
				
			||||||
    <link rel="stylesheet" href="<%= Routes.static_path(@conn, "/css/app.css") %>"/>
 | 
					    <link rel="stylesheet" href="<%= Routes.static_path(@conn, "/css/app.css") %>"/>
 | 
				
			||||||
    <script defer type="text/javascript" src="<%= Routes.static_path(@conn, "/js/app.js") %>"></script>
 | 
					    <script defer type="text/javascript" src="<%= Routes.static_path(@conn, "/js/app.js") %>"></script>
 | 
				
			||||||
  </head>
 | 
					  </head>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,7 +4,7 @@
 | 
				
			||||||
    <meta charset="utf-8"/>
 | 
					    <meta charset="utf-8"/>
 | 
				
			||||||
    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 | 
					    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 | 
				
			||||||
    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 | 
					    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 | 
				
			||||||
    <title>Core · Phoenix Framework</title>
 | 
					    <title><%= I18n.t! "en", "site.title" %></title>
 | 
				
			||||||
    <link rel="stylesheet" href="<%= Routes.static_path(@conn, "/css/app.css") %>"/>
 | 
					    <link rel="stylesheet" href="<%= Routes.static_path(@conn, "/css/app.css") %>"/>
 | 
				
			||||||
    <script defer type="text/javascript" src="<%= Routes.static_path(@conn, "/js/app.js") %>"></script>
 | 
					    <script defer type="text/javascript" src="<%= Routes.static_path(@conn, "/js/app.js") %>"></script>
 | 
				
			||||||
  </head>
 | 
					  </head>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,7 +4,7 @@
 | 
				
			||||||
    <meta charset="utf-8"/>
 | 
					    <meta charset="utf-8"/>
 | 
				
			||||||
    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 | 
					    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 | 
				
			||||||
    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 | 
					    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 | 
				
			||||||
    <title>Content · Phoenix Framework</title>
 | 
					    <title><%= I18n.t! "en", "site.title" %></title>
 | 
				
			||||||
    <link rel="stylesheet" href="<%= Routes.static_path(@conn, "/css/app.css") %>"/>
 | 
					    <link rel="stylesheet" href="<%= Routes.static_path(@conn, "/css/app.css") %>"/>
 | 
				
			||||||
    <script defer type="text/javascript" src="<%= Routes.static_path(@conn, "/js/app.js") %>"></script>
 | 
					    <script defer type="text/javascript" src="<%= Routes.static_path(@conn, "/js/app.js") %>"></script>
 | 
				
			||||||
  </head>
 | 
					  </head>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -20,7 +20,7 @@ defmodule Content.LayoutView do
 | 
				
			||||||
      opt = %Option{} ->
 | 
					      opt = %Option{} ->
 | 
				
			||||||
        opt.option_value
 | 
					        opt.option_value
 | 
				
			||||||
      _ ->
 | 
					      _ ->
 | 
				
			||||||
        "Hello"
 | 
					        I18n.t! "en", "site.title"
 | 
				
			||||||
    end
 | 
					    end
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -38,7 +38,7 @@ defmodule Content.LayoutView do
 | 
				
			||||||
      opt = %Option{} ->
 | 
					      opt = %Option{} ->
 | 
				
			||||||
        opt.option_value
 | 
					        opt.option_value
 | 
				
			||||||
      _ ->
 | 
					      _ ->
 | 
				
			||||||
        "Yet another website"
 | 
					        I18n.t! "en", "site.excerpt"
 | 
				
			||||||
    end
 | 
					    end
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,7 +4,7 @@
 | 
				
			||||||
    <meta charset="utf-8"/>
 | 
					    <meta charset="utf-8"/>
 | 
				
			||||||
    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 | 
					    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 | 
				
			||||||
    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 | 
					    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 | 
				
			||||||
    <title>Core · Phoenix Framework</title>
 | 
					    <title><%= I18n.t! "en", "site.title" %></title>
 | 
				
			||||||
    <link rel="stylesheet" href="<%= Routes.static_path(@conn, "/css/app.css") %>"/>
 | 
					    <link rel="stylesheet" href="<%= Routes.static_path(@conn, "/css/app.css") %>"/>
 | 
				
			||||||
    <script defer type="text/javascript" src="<%= Routes.static_path(@conn, "/js/app.js") %>"></script>
 | 
					    <script defer type="text/javascript" src="<%= Routes.static_path(@conn, "/js/app.js") %>"></script>
 | 
				
			||||||
  </head>
 | 
					  </head>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,3 +3,6 @@ email:
 | 
				
			||||||
    name: ""
 | 
					    name: ""
 | 
				
			||||||
    address: ""
 | 
					    address: ""
 | 
				
			||||||
    phone: ""
 | 
					    phone: ""
 | 
				
			||||||
 | 
					site:
 | 
				
			||||||
 | 
					  title: Legendary
 | 
				
			||||||
 | 
					  excerpt: Yet another website. 
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue