Merge branch 'dev' of http://192.168.10.125/nms/oam.git into dev
This commit is contained in:
@@ -66,7 +66,7 @@
|
|||||||
#else if(_locale=='en_US')
|
#else if(_locale=='en_US')
|
||||||
<span>English</span>
|
<span>English</span>
|
||||||
#else
|
#else
|
||||||
<span>Russia</span>
|
<!-- <span>Russia</span> -->
|
||||||
#end
|
#end
|
||||||
<span class="caret"></span>
|
<span class="caret"></span>
|
||||||
</a>
|
</a>
|
||||||
@@ -77,22 +77,22 @@
|
|||||||
English
|
English
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="dropdown-menu-title" style="height:35px">
|
<!-- <li class="dropdown-menu-title" style="height:35px">
|
||||||
<a href="/main/showMain?_locale=ru_RU" class="international-a">
|
<a href="/main/showMain?_locale=ru_RU" class="international-a">
|
||||||
Russia
|
Russia
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li> -->
|
||||||
#else if(_locale=='en_US')
|
#else if(_locale=='en_US')
|
||||||
<li class="dropdown-menu-title" style="height:35px">
|
<li class="dropdown-menu-title" style="height:35px">
|
||||||
<a href="/main/showMain?_locale=zh_CN" class="international-a">
|
<a href="/main/showMain?_locale=zh_CN" class="international-a">
|
||||||
简体中文
|
简体中文
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="dropdown-menu-title" style="height:35px">
|
<!-- <li class="dropdown-menu-title" style="height:35px">
|
||||||
<a href="/main/showMain?_locale=ru_RU" class="international-a">
|
<a href="/main/showMain?_locale=ru_RU" class="international-a">
|
||||||
Russia
|
Russia
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li> -->
|
||||||
#else
|
#else
|
||||||
<li class="dropdown-menu-title" style="height:35px">
|
<li class="dropdown-menu-title" style="height:35px">
|
||||||
<a href="/main/showMain?_locale=zh_CN" class="international-a">
|
<a href="/main/showMain?_locale=zh_CN" class="international-a">
|
||||||
|
|||||||
Reference in New Issue
Block a user