@@ -49,7 +49,7 @@ <h4 class="list-group-item-heading">{{theme.name}}
4949 < div style ="float: left; width: 40% ">
5050 < div ng-if ="theme.needsToBeSynced ">
5151 < span class ="glyphicon glyphicon-exclamation-sign warning "> </ span >
52- Needs to be synced. Press 'Sync' or ' Pull'
52+ Needs to be synced. Press 'Pull'
5353 </ div >
5454 < button ng-show ="theme.conflictRecognized " class ="btn btn-sm btn-default "
5555 data-toggle ="modal "
@@ -100,46 +100,14 @@ <h4 class="list-group-item-heading">{{theme.name}}
100100 </div>-->
101101 < button type ="button " ng-click ="push(theme.folder) "
102102 class ="btn btn-default "
103+ title ="Push only items that have been changed since the last push or pull. "
103104 ng-disabled ="theme.syncing||(!theme.datePulled&&!theme.dateSynced) ">
104- Push</ button >
105+ Push Updates </ button >
105106 < button type ="button " ng-click ="pull(theme.folder) "
106107 class ="btn btn-default "
107108 ng-disabled ="theme.syncing ">
108109 Pull</ button >
109110
110- < div class ="btn-group dropdown " ng-show ="!theme.waiting ">
111- < button type ="button "
112- ng-click ="sync(theme.folder) "
113- class ="btn btn-default "
114- ng-disabled ="theme.syncing ">
115- Sync
116- </ button >
117- < div class ="btn-group ">
118- < button class ="btn btn-default dropdown-toggle "
119- data-toggle ="dropdown "
120- ng-disabled ="theme.syncing ">
121- < span class ="caret "> </ span >
122- </ button >
123- < ul class ="dropdown-menu " onclick ="event.stopPropagation() ">
124- < li class ="no-a-tag "
125- ng-click ="theme.backgroundSync=!theme.backgroundSync ">
126- < input type ="checkbox " ng-checked ="theme.backgroundSync "
127- ng-model ="themebackgroundSync "
128- ng-change ="saveBackgroundSyncTheme(theme.folder) "> Background Sync
129- </ li >
130- < li class ="no-a-tag " ng-show ="theme.backgroundSync ">
131- < strong > Background Sync Interval</ strong >
132- < br >
133- < input type ="text "
134- ng-change ="updateDxsyncBackgroundInterval(theme.folder) "
135- ng-model ="theme.settings.syncIntervalMin "
136- class ="ng-pristine ng-untouched ng-valid " style ="width: 30px; ">
137- minutes
138-
139- </ li >
140- </ ul >
141- </ div >
142- </ div >
143111 < div class ="btn-group " ng-show ="theme.waiting ">
144112 < button type ="button "
145113 ng-click ="cancel(theme.folder) "
0 commit comments