dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #29905
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15178: update to jquery and integration with menu
------------------------------------------------------------
revno: 15178
committer: Abyot Asalefew Gizaw abyota@xxxxxxxxx
branch nick: dhis2
timestamp: Tue 2014-05-06 14:52:00 +0200
message:
update to jquery and integration with menu
modified:
dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/event-capture.appcache
dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/index.html
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/tracker-capture-appcache
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/event-capture.appcache'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/event-capture.appcache 2014-04-14 06:37:04 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/event-capture.appcache 2014-05-06 12:52:00 +0000
@@ -2,9 +2,9 @@
CACHE:
../dhis-web-commons/javascripts/jQuery/jquery.min.js
-../dhis-web-commons/javascripts/jQuery/ui/jquery-ui-1.9.1.custom.min.js
+../dhis-web-commons/javascripts/jQuery/ui/jquery-ui.min.js
../dhis-web-commons/javascripts/jQuery/jquery.tmpl.js
-../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui-1.9.1.custom.css
+../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui.css
../dhis-web-commons/fonts/LiberationSans-Regular-webfont.eot
=== modified file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html 2014-04-20 16:30:35 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html 2014-05-06 12:52:00 +0000
@@ -8,9 +8,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.min.js"></script>
- <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/ui/jquery-ui-1.9.1.custom.min.js"></script>
+ <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/ui/jquery-ui.min.js"></script>
<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.tmpl.js"></script>
- <link rel="stylesheet" type="text/css" href="../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui-1.9.1.custom.css">
+ <link rel="stylesheet" type="text/css" href="../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui.css">
<script type="text/javascript" src="../dhis-web-commons/bootstrap/js/bootstrap.min.js"></script>
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json 2014-04-11 07:13:54 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json 2014-05-06 12:52:00 +0000
@@ -61,5 +61,13 @@
"not_like": "NOT LIKE",
"move_to_selected": "Move to selected",
"move_all_to_selected": "Move all to selected",
- "more": "More"
+ "more": "More",
+ "profile": "Profile",
+ "applications": "Apps",
+ "more_applications": "More apps",
+ "settings": "Settings",
+ "account": "Account",
+ "help": "Help",
+ "log_out": "Log out",
+ "about_dhis2": "About DHIS 2"
}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/index.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/index.html 2014-04-08 15:37:00 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/index.html 2014-05-06 12:52:00 +0000
@@ -9,8 +9,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.min.js"></script>
- <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/ui/jquery-ui-1.9.1.custom.min.js"></script>
- <link rel="stylesheet" type="text/css" href="../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui-1.9.1.custom.css">
+ <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/ui/jquery-ui.min.js"></script>
+ <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.tmpl.js"></script>
+ <link rel="stylesheet" type="text/css" href="../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui.css">
<script type="text/javascript" src="../dhis-web-commons/bootstrap/js/bootstrap.min.js"></script>
<link rel="stylesheet" type="text/css" href="../dhis-web-commons/bootstrap/css/bootstrap.min.css">
@@ -58,11 +59,16 @@
<script type="text/javascript" src="scripts/services.js"></script>
<script type="text/javascript" src="scripts/filters.js"></script>
<script type="text/javascript" src="scripts/directives.js"></script>
- <script type="text/javascript" src="scripts/controllers.js"></script>
+ <script type="text/javascript" src="scripts/controllers.js"></script>
+
+ <!-- Menu scripts -->
+ <script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.translate.js"></script>
+ <script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.menu.js"></script>
<link type="text/css" rel="stylesheet" href="../dhis-web-commons/font-awesome/css/font-awesome.min.css"/>
<link type="text/css" rel="stylesheet" media="screen,print" href="../dhis-web-commons/css/light_blue/light_blue.css"/>
<link type="text/css" rel="stylesheet" media="screen,print" href="../dhis-web-commons/css/widgets.css"/>
+ <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/css/menu.css">
<link type="text/css" rel="stylesheet" href="styles/style.css">
@@ -71,10 +77,81 @@
<div id="header" ng-controller="HeaderController">
<div class="container-heading">
<img ng-click="home()" id="headerBanner" src="../dhis-web-commons/css/light_blue/logo_banner.png" style="cursor:pointer" title="{{'dhis2_home'| translate}}">
- </div>
- <div id="headerMessage" class="bold"></div>
- </div>
+ </div>
+ <div id="headerMessage" class="bold"></div>
+
+ <!-- Menu html -->
+ <ul id="menuLinkArea">
+ <li id="profileDropDown_button">
+ <a id="profileMenuLink" class="menu-link drop-down-menu-link">
+ <i class="fa fa-user"></i>{{'profile'| translate}}
+ </a>
+ </li>
+ <li id="appsDropDown_button">
+ <a id="appsMenuLink" class="menu-link drop-down-menu-link">
+ <i class="fa fa-th"></i>{{'applications'| translate}}
+ </a>
+ </li>
+ </ul>
+
+ <div id="appsDropDown" class="menuDropDownArea app-menu-dropdown appsMenuLink_menu" >
+ <div class="caret-up-border"></div>
+ <div class="caret-up-background"></div>
+ <div class="menu-drop-down-wrap">
+ <div class="menu-drop-down-scroll">
+ <ul class="menuDropDownBox"><li class="menu-placeholder"><img src="../images/ajax-loader-bar.gif"></li></ul>
+ </div>
+ </div>
+ <div class="apps-menu-more"><a href="../dhis-web-commons-about/modules.action">{{'more_applications'| translate}}</a></div>
+ </div>
+
+ <div id="profileDropDown" class="menuDropDownArea app-menu-dropdown ui-helper-clearfix profileMenuLink_menu">
+ <div class="caret-up-border"></div>
+ <div class="caret-up-background"></div>
+ <ul class="menuDropDownBox">
+ <li>
+ <a class="app-menu-item" href="../dhis-web-commons-about/userSettings.action">
+ <img src="../icons/usersettings.png" alt="{{'settings'| translate}}">
+ <span>{{'settings'| translate}} </span>
+ </a>
+ </li>
+ <li>
+ <a class="app-menu-item" href="../dhis-web-commons-about/showUpdateUserProfileForm.action">
+ <img src="../icons/function-profile.png" alt="{{'profile'| translate}}">
+ <span>{{'settings'| translate}} </span>
+ </a>
+ </li>
+ <li>
+ <a class="app-menu-item" href="../dhis-web-commons-about/showUpdateUserAccountForm.action">
+ <img src="../icons/function-account.png" alt="{{'account' | translate}}">
+ <span>{{'account' | translate}} </span>
+ </a>
+ </li>
+ <li>
+ <a class="app-menu-item" href="../dhis-web-commons-about/help.action">
+ <img src="../icons/function-help-center.png" alt="{{'help' | translate}}">
+ <span>{{'help' | translate}} </span>
+ </a>
+ </li>
+ <li>
+ <a class="app-menu-item" href="../dhis-web-commons-security/logout.action">
+ <img src="../icons/function-log-out.png" alt="{{'log_out' | translate}}">
+ <span>{{'log_out' | translate}} </span>
+ </a>
+ </li>
+ <li>
+ <a class="app-menu-item" href="../dhis-web-commons-about/about.action">
+ <img src="../icons/function-about-dhis2.png" alt="{{'about_dhis2' | translate}}">
+ <span>{{'about_dhis2' | translate}} </span>
+ </a>
+ </li>
+ </ul>
+ </div>
+ <!-- /Menu html -->
+
+ </div>
<div class="container-1" data-ng-view=''></div>
+
</body>
</html>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2014-04-08 15:37:00 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2014-05-06 12:52:00 +0000
@@ -318,7 +318,6 @@
.container-heading {
color: white;
- padding: 12px;
}
div.paging a.active
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/tracker-capture-appcache'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/tracker-capture-appcache 2014-03-18 10:09:53 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/tracker-capture-appcache 2014-05-06 12:52:00 +0000
@@ -2,8 +2,8 @@
CACHE:
../dhis-web-commons/javascripts/jQuery/jquery.min.js
-../dhis-web-commons/javascripts/jQuery/ui/jquery-ui-1.9.1.custom.min.js
-../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui-1.9.1.custom.css
+../dhis-web-commons/javascripts/jQuery/ui/jquery-ui.min.js
+../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui.css
../dhis-web-commons/fonts/LiberationSans-Regular-webfont.eot
../dhis-web-commons/fonts/LiberationSans-Regular-webfont.woff
